X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=548f9afffa3c2dc961da2dc932bff11d7b0d588f;hb=203b3877d564199078fac0feb7efe0621a914263;hp=47534f45d9bb042063159eb4a2f4dea681ba6d3c;hpb=4a0e3628458792dabc51d51a2a9e3a7da191fae4;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 47534f4..548f9af 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [1.0])
+AM_INIT_AUTOMAKE([doldaconnect], [1.1])
 AM_CONFIG_HEADER(config.h)
 
 DOLDA_AC_GROUP([Checking build chain])
@@ -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])
@@ -203,6 +202,8 @@ AC_CHECK_MEMBER(struct sockaddr_in6.sin6_family, [ AC_DEFINE(HAVE_IPV6) ], , [#i
 AH_TEMPLATE(HAVE_RESOLVER, [define if your system supports the res_* functions to fetch DNS RRs])
 AC_CHECK_LIB(resolv, res_query, [ AC_DEFINE(HAVE_RESOLVER)
 				  LDFLAGS="$LDFLAGS -lresolv" ])
+AC_CHECK_LIB(resolv, __res_query, [ AC_DEFINE(HAVE_RESOLVER)
+		     		    LDFLAGS="$LDFLAGS -lresolv" ])
 
 # Unix credentials selector
 AH_TEMPLATE(UNIX_AUTH_STYLE, [undefine for no Unix auth, 1 for Linux style, 2 for BSD style])
@@ -246,7 +247,6 @@ else
 fi
 AC_DEFINE_UNQUOTED([RELEASEINFO], ["$relinfo"])
 
-AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -288,7 +288,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