From f879c9d94efed650815fbecaa84a713f898c5672 Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Fri, 7 Mar 2008 01:14:46 +0100 Subject: [PATCH] Conditional compiling for fnet-adc.c. --- configure.in | 27 ++++++++++++++++++--------- daemon/Makefile.am | 5 ++++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/configure.in b/configure.in index e0fd6ee..02c0fc5 100644 --- a/configure.in +++ b/configure.in @@ -97,6 +97,14 @@ DOLDA_ENABLE(daemon, [ --enable-daemon Enable the daemon], yes, [HAS_LIBZ HAS_LIBBZ2 HAS_GDBM]) AM_CONDITIONAL(DAEMON, test "$enable_daemon" = yes) +# ADC check +DOLDA_ENABLE(fnetadc, [ --enable-fnetadc Enable ADC code (experimental)], no, + [enable_daemon]) +if test "$enable_fnetadc" = yes; then + experimental=yes +fi +AM_CONDITIONAL(ADC, test "$enable_fnetadc" = yes) + # Gtk GUI check DOLDA_ENABLE(gtk2ui, [ --enable-gtk2ui Enable the GTK2 user interface], yes, [HAS_GTK2 HAS_LIBBZ2 HAS_LIBXML]) @@ -286,15 +294,16 @@ autopackage/guishell.apspec echo echo "Dolda Connect has been configured with the following settings:" echo -echo " Daemon: $enable_daemon" -echo " PAM support: $pam_msg" -echo " Kerberos 5 support: $krb_msg" -echo " GTK2 user interface: $enable_gtk2ui" -echo " Dolconf configurator: $enable_dolconf" -echo " GUI shell: $enable_guishell" -echo " Guile extension library: $enable_guile" -echo " GNOME transfer applet: $enable_gnomeapplet" -echo " Gaim chat plugin: $gaimplugin_msg" +echo " Daemon: $enable_daemon" +echo " PAM support: $pam_msg" +echo " Kerberos 5 support: $krb_msg" +echo " ADC support (unfinished): $enable_fnetadc" +echo " GTK2 user interface: $enable_gtk2ui" +echo " Dolconf configurator: $enable_dolconf" +echo " GUI shell: $enable_guishell" +echo " Guile extension library: $enable_guile" +echo " GNOME transfer applet: $enable_gnomeapplet" +echo " Gaim chat plugin: $gaimplugin_msg" echo if tput bold >/dev/null 2>&1 && tty <&2 >/dev/null 2>&1; then diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e809b60..532b4da 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -11,7 +11,6 @@ doldacond_SOURCES= main.c \ filenet.c \ filenet.h \ fnet-dc.c \ - fnet-adc.c \ auth.c \ auth.h \ auth-pam.c \ @@ -27,6 +26,10 @@ doldacond_SOURCES= main.c \ conf.h \ reqstat.c +if ADC +doldacond_SOURCES += fnet-adc.c +endif + EXTRA_DIST=emacs-local doldacond_LDADD=$(top_srcdir)/common/libcommon.a \ @KRB5_LIBS@ -lbz2 -lz -lgdbm @PAM_LIBS@ @KEYUTILS_LIBS@ -- 2.11.0