Use an Automake conditional for Guile lib building.

diff --git a/configure.in b/configure.in
index 4f35321..e42caf8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,6 @@ AC_CHECK_LIB(z, deflate, [:], AC_MSG_ERROR([*** must have zlib]))
 AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, [:], AC_MSG_ERROR([*** must have bzlib]))
 AC_CHECK_LIB(gdbm, gdbm_open, [:], AC_MSG_ERROR([*** must have gdbm]))
 
-extlibs=
 experimental=no
 
 DOLDA_AC_GROUP([Checking optional libraries])
@@ -138,12 +137,12 @@ if test -z "$gaimplugin_msg"; then
 fi
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
-guile_msg=no
+enable_guile=no
 if test "$with_guile" = yes; then
        GUILE_FLAGS
-       extlibs="$extlibs guile"
-       guile_msg=yes
+       enable_guile=yes
 fi
+AM_CONDITIONAL(ELIB_GUILE, test "$enable_guile" = yes)
 
 # Check whether to install baseconv
 AC_ARG_ENABLE(baseconv, [  --enable-baseconv       Install the baseconv utility])
@@ -246,7 +245,6 @@ else
 fi
 AC_DEFINE_UNQUOTED([RELEASEINFO], ["$relinfo"])
 
-AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -288,7 +286,7 @@ 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: $guile_msg"
+echo "    Guile extension library: $enable_guile"
 echo "    GNOME transfer applet:   $enable_gnomeapplet"
 echo "    Gaim chat plugin:        $gaimplugin_msg"
 echo

diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 07bce28..1f19dc7 100644 (file)
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -5,6 +5,9 @@ endif
 if CLI_GTK2
 man_MANS += dolcon.1
 endif
+if ELIB_GUILE
+man_MANS += hubmgr.1
+endif
 BUILT_SOURCES = doldacond.conf.5
 
 doldacond.conf.5: doldacond.conf.5.in ../../daemon/*.c mkcvman

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 01c8cfa..ba0fe3b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
 EXTRA_DIST = makecmds uicmds
 
-SUBDIRS=. @extlibs@
-DIST_SUBDIRS=guile
+SUBDIRS = guile
 
 lib_LTLIBRARIES = libdcui.la
 

diff --git a/lib/guile/Makefile.am b/lib/guile/Makefile.am
index 6b4e664..7863f14 100644 (file)
--- a/lib/guile/Makefile.am
+++ b/lib/guile/Makefile.am
@@ -1,8 +1,9 @@
 SUBDIRS=dolcon
 
+if ELIB_GUILE
 dist_bin_SCRIPTS=autodl chatlog hubmgr dcruncmd
-
 lib_LTLIBRARIES=libdolcon-guile.la
+endif
 
 libdolcon_guile_la_SOURCES=dolcon-guile.c
 libdolcon_guile_la_LDFLAGS=-module -avoid-version

diff --git a/lib/guile/dolcon/Makefile.am b/lib/guile/dolcon/Makefile.am
index 0dbf180..76ced14 100644 (file)
--- a/lib/guile/dolcon/Makefile.am
+++ b/lib/guile/dolcon/Makefile.am
@@ -1,4 +1,7 @@
 moduledir=$(datadir)/guile/site/dolcon
+
+if ELIB_GUILE
 module_DATA=ui.scm util.scm
+endif
 
 EXTRA_DIST=ui.scm util.scm