X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=0a8dd6da74411c193be79339ee901f745a6ac90a;hb=a1b1a665293c5707d3854a36c4de625aded9652a;hp=3f7c622db22b4d89b3de058873cec40ffa8ca428;hpb=5b5c7760b25407cdb8481dd6115c5b19af8c39f0;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 3f7c622..0a8dd6d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.3])
+AM_INIT_AUTOMAKE([doldaconnect], [0.4])
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
@@ -7,10 +7,16 @@ 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]))
@@ -124,6 +130,10 @@ if test "$with_guile" = yes; then
 	guile_msg=Yes
 fi
 
+# Check whether to install baseconv
+AC_ARG_ENABLE(baseconv, [  --enable-baseconv       Install the baseconv utility])
+AM_CONDITIONAL(BASECONV, test "$enable_baseconv" = yes)
+
 # Kerberos check
 krb_msg=No
 AH_TEMPLATE(HAVE_KRB5, [define to compile support for Kerberos 5 (not GSS-API) authentication])
@@ -194,6 +204,7 @@ AC_SUBST([clients extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
+common/Makefile
 daemon/Makefile
 lib/Makefile
 lib/guile/Makefile
@@ -204,8 +215,11 @@ clients/gnome-trans-applet/Makefile
 clients/gaim/Makefile
 include/Makefile
 include/doldaconnect/Makefile
+doc/Makefile
+doc/man/Makefile
 po/Makefile.in
 config/Makefile
+contrib/Makefile
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
 autopackage/dcguile.apspec