X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=462c2785d08ba8ad7fc6ecc9978f2d1e35ad4b9a;hb=9db779f4d89f70aa3ccfbaebf421032f1b552553;hp=e87c5863b37f3340b801a309d8bc1201be15b8c4;hpb=0c1a8103b768bff6a0a147a896d8f4268c806b5b;p=doldaconnect.git diff --git a/configure.in b/configure.in index e87c586..462c278 100644 --- a/configure.in +++ b/configure.in @@ -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])) @@ -73,10 +79,10 @@ fi gtk2ui_msg=No AC_ARG_ENABLE(gtk2ui, [ --enable-gtk2ui Enable the GTK2 user interface]) if test "$enable_gtk2ui" = yes; then - if "$HAS_GTK2" = no; then + if test "$HAS_GTK2" = no; then AC_MSG_ERROR([*** cannot build the GTK2 UI without a GTK2 library]) fi - if "$HAS_LIBXML" = no; then + if test "$HAS_LIBXML" = no; then AC_MSG_ERROR([*** the GTK2 UI needs libxml2]) fi fi @@ -194,6 +200,7 @@ AC_SUBST([clients extlibs]) AC_OUTPUT([ Makefile autopackage/Makefile +common/Makefile daemon/Makefile lib/Makefile lib/guile/Makefile @@ -203,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