Version bump.

[doldaconnect.git] / configure.in

diff --git a/configure.in b/configure.in
index 65a12f4..2b58e87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.2])
+AM_INIT_AUTOMAKE([doldaconnect], [0.3.1])
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -7,12 +7,19 @@ AC_PROG_INSTALL
 
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
+
+# Temporary hack to make libtool not check for g++ or g77
+m4_defun([_LT_AC_LANG_CXX_CONFIG], true)
+m4_defun([_LT_AC_LANG_F77_CONFIG], true)
 AM_PROG_LIBTOOL
 
 AC_CHECK_LIB(pam, pam_start, , AC_MSG_ERROR([*** must have PAM]))
-AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR([*** PAM requires a working dynamic loader (libdl)]))
+# Doesn't work on at least FreeBSD, and the existance of PAM should
+# already indicate that dlopen works.
+# AC_CHECK_LIB(dl, dlopen, , AC_MSG_ERROR([*** PAM requires a working dynamic loader (libdl)]))
 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]))
 
 clients=
 extlibs=
@@ -20,6 +27,7 @@ experimental=no
 
 AC_CHECK_PROG([PKG_CONFIG], pkg-config, yes, no)
 
+# Gtk 2.0 check
 AC_ARG_WITH(gtk2, [  --with-gtk2             Enable GTK2 support])
 if test "$with_gtk2" = no; then
        HAS_GTK2=no
@@ -50,16 +58,40 @@ if test "$with_gtk2" = yes -a "$HAS_GTK2" = no; then
        AC_MSG_ERROR([*** cannot find GTK2 on this system])
 fi
 
+# libxml2 check
+AC_MSG_CHECKING([for libxml2 package information])
+if test "$PKG_CONFIG" = yes; then
+       if pkg-config --modversion libxml-2.0 >/dev/null 2>&1; then
+               AC_MSG_RESULT(yes)
+       else
+               AC_MSG_RESULT(no)
+               HAS_LIBXML=no
+       fi
+       if test "$HAS_LIBXML" != no; then
+               AC_CHECK_LIB(xml2, xmlReadFile, [HAS_LIBXML=yes], [HAS_LIBXML=no], `pkg-config --libs libxml-2.0`)
+       fi
+else
+       AC_MSG_RESULT(no)
+       HAS_LIBXML=no
+fi
+
+# Gtk GUI check
 gtk2ui_msg=No
 AC_ARG_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface])
-if test "$enable_gtk2ui" = yes -a "$HAS_GTK2" = no; then
-       AC_MSG_ERROR([*** cannot build the GTK2 UI without a GTK2 library])
+if test "$enable_gtk2ui" = yes; then
+       if test "$HAS_GTK2" = no; then
+               AC_MSG_ERROR([*** cannot build the GTK2 UI without a GTK2 library])
+       fi
+       if test "$HAS_LIBXML" = no; then
+               AC_MSG_ERROR([*** the GTK2 UI needs libxml2])
+       fi
 fi
 if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes; then
        clients="$clients gtk2"
        gtk2ui_msg=Yes
 fi
 
+# Gtk progress bar check
 gtk2pbar_msg=No
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
 AC_ARG_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)])
@@ -72,6 +104,7 @@ if test "$enable_gtk2pbar" = yes; then
        AC_DEFINE(ENABLE_GTK2PBAR)
 fi
 
+# Gnome applet check
 gnometrapplet_msg=No
 AC_ARG_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer applet (experimental)])
 if test "$enable_gnomeapplet" = yes; then
@@ -80,6 +113,7 @@ if test "$enable_gnomeapplet" = yes; then
        clients="$clients gnome-trans-applet"
 fi
 
+# Gaim plugin check
 gaimplugin_msg=No
 AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable GNOME transfer applet (experimental)])
 if test "$enable_gaimplugin" = yes; then
@@ -88,6 +122,7 @@ if test "$enable_gaimplugin" = yes; then
        clients="$clients gaim"
 fi
 
+# Guile check (XXX: Shouldn't have to be enabled manually)
 guile_msg=No
 if test "$with_guile" = yes; then
        GUILE_FLAGS
@@ -95,6 +130,7 @@ if test "$with_guile" = yes; then
        guile_msg=Yes
 fi
 
+# Kerberos check
 krb_msg=No
 AH_TEMPLATE(HAVE_KRB5, [define to compile support for Kerberos 5 (not GSS-API) authentication])
 AC_ARG_WITH(krb5, [  --with-krb5[=PATH]        Enable Kerberos 5 (not GSSAPI) authentication])
@@ -131,6 +167,7 @@ if test "$with_krb5" != no -a "$HAS_KRB5" = yes; then
 fi
 AC_SUBST([KRB5_LDADD])
 
+# Misc. functions checks
 AC_CHECK_FUNC(vswprintf, , AC_MSG_ERROR([*** must have vswprintf]))
 AH_TEMPLATE(HAVE_WCSCASECMP, [define if your system implements wcscasecmp])
 AC_CHECK_FUNC(wcscasecmp, [ AC_DEFINE(HAVE_WCSCASECMP) ])
@@ -163,6 +200,7 @@ AC_SUBST([clients extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
+common/Makefile
 daemon/Makefile
 lib/Makefile
 lib/guile/Makefile
@@ -172,8 +210,11 @@ clients/gtk2/Makefile
 clients/gnome-trans-applet/Makefile
 clients/gaim/Makefile
 include/Makefile
+include/doldaconnect/Makefile
+doc/Makefile
 po/Makefile.in
 config/Makefile
+contrib/Makefile
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
 autopackage/dcguile.apspec