X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=configure.in;h=1679a2475fd8f9d2dd32860f5a6a0a9180188a15;hb=ae7ccbfed927620c48eacd88092b66fd79e6b7d5;hp=3ab313e0b73e9dc70da011ef76811bb526f9ffbb;hpb=72e3daf510211e87c35328c2656baece5545c488;p=doldaconnect.git

diff --git a/configure.in b/configure.in
index 3ab313e..1679a24 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,10 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.4])
+AM_INIT_AUTOMAKE([doldaconnect], [0.5])
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
+AC_PROG_CC_C_O
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
 AM_GNU_GETTEXT_VERSION(0.12.1)
@@ -11,17 +13,13 @@ 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_PROG_LIBTOOL
 
 AC_CHECK_LIB(pam, pam_start, , AC_MSG_ERROR([*** must have PAM]))
-# 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=
 experimental=no
 
@@ -41,12 +39,14 @@ if test "$HAS_GTK2" != no; then
 			AC_MSG_RESULT(no)
         		HAS_GTK2=no
         	fi
+		GTK2_LDADD="`pkg-config --libs gtk+-2.0`"
+		GTK2_CFLAGS="`pkg-config --cflags gtk+-2.0`"
 		if test "$HAS_GTK2" != no; then
-	                AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [HAS_GTK2=yes], [HAS_GTK2=no], `pkg-config --libs gtk+-2.0`)
+	                AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [HAS_GTK2=yes], [HAS_GTK2=no], "$GTK2_LDADD")
 		fi
         	if test "$HAS_GTK2" = yes; then
         		cpp_bak="$CPPFLAGS"
-        		CPPFLAGS="$CPPFLAGS `pkg-config --cflags gtk+-2.0`"
+        		CPPFLAGS="$CPPFLAGS $GTK2_CFLAGS"
         		AC_CHECK_HEADER(gtk/gtk.h, [], [HAS_GTK2=no])
         		CPPFLAGS="$cpp_bak"
         	fi
@@ -57,6 +57,7 @@ fi
 if test "$with_gtk2" = yes -a "$HAS_GTK2" = no; then
 	AC_MSG_ERROR([*** cannot find GTK2 on this system])
 fi
+AC_SUBST([GTK2_LDADD GTK2_CFLAGS])
 
 # libxml2 check
 AC_MSG_CHECKING([for libxml2 package information])
@@ -67,13 +68,33 @@ if test "$PKG_CONFIG" = yes; then
 		AC_MSG_RESULT(no)
 		HAS_LIBXML=no
 	fi
+	LIBXML_LDADD="`pkg-config --libs libxml-2.0`"
+	LIBXML_CFLAGS="`pkg-config --cflags libxml-2.0`"
 	if test "$HAS_LIBXML" != no; then
-		AC_CHECK_LIB(xml2, xmlReadFile, [HAS_LIBXML=yes], [HAS_LIBXML=no], `pkg-config --libs libxml-2.0`)
+		AC_CHECK_LIB(xml2, xmlReadFile, [HAS_LIBXML=yes], [HAS_LIBXML=no], "$LIBXML_LDADD")
 	fi
 else
 	AC_MSG_RESULT(no)
 	HAS_LIBXML=no
 fi
+AC_SUBST([LIBXML_LDADD LIBXML_CFLAGS])
+
+# libnotify check
+AC_MSG_CHECKING([for libnotify package information])
+if test "$PKG_CONFIG" = yes; then
+	if pkg-config --modversion libnotify >/dev/null 2>&1; then
+	        AC_MSG_RESULT(yes)
+	else
+		AC_MSG_RESULT(no)
+		HAS_LIBNOTIFY=no
+	fi
+else
+	AC_MSG_RESULT(no)
+	HAS_LIBNOTIFY=no
+fi
+if test "$HAS_LIBNOTIFY" != no; then
+	AC_CHECK_LIB(notify, notify_init, [HAS_LIBNOTIFY=yes], [HAS_LIBNOTIFY=no], `pkg-config --libs libnotify`)
+fi
 
 # Gtk GUI check
 gtk2ui_msg=No
@@ -86,10 +107,21 @@ if test "$enable_gtk2ui" = yes; then
 		AC_MSG_ERROR([*** the GTK2 UI needs libxml2])
 	fi
 fi
-if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes; then
-	clients="$clients gtk2"
+if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes -a "$HAS_LIBXML" = yes; then
 	gtk2ui_msg=Yes
 fi
+AM_CONDITIONAL(CLI_GTK2, test "$gtk2ui_msg" = Yes)
+
+# Dolconf check
+dolconf_msg=No
+AC_ARG_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper])
+if test "$enable_dolconf" = yes -a "$HAS_GTK2" = no; then
+	AC_MSG_ERROR([*** cannot build dolconf without GTK2])
+fi
+if test "$enable_dolconf" != no -a "$HAS_GTK2" = yes; then
+	dolconf_msg=Yes
+fi
+AM_CONDITIONAL(DOLCONF, test "$dolconf_msg" = Yes)
 
 # Gtk progress bar check
 gtk2pbar_msg=No
@@ -110,8 +142,8 @@ AC_ARG_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer appl
 if test "$enable_gnomeapplet" = yes; then
 	experimental=yes
 	gnometrapplet_msg=Yes
-	clients="$clients gnome-trans-applet"
 fi
+AM_CONDITIONAL(CLI_GNOMEAPPLET, test "$gnometrapplet_msg" = Yes)
 
 # Gaim plugin check
 gaimplugin_msg=No
@@ -119,8 +151,8 @@ AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable GNOME transfer apple
 if test "$enable_gaimplugin" = yes; then
 	experimental=yes
 	gaimplugin_msg=Yes
-	clients="$clients gaim"
 fi
+AM_CONDITIONAL(CLI_GAIM, test "$gaimplugin_msg" = Yes)
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
 guile_msg=No
@@ -132,7 +164,7 @@ fi
 
 # Check whether to install baseconv
 AC_ARG_ENABLE(baseconv, [  --enable-baseconv       Install the baseconv utility])
-AM_CONDITIONAL(baseconv, test "$enable_baseconv" = yes)
+AM_CONDITIONAL(BASECONV, test "$enable_baseconv" = yes)
 
 # Kerberos check
 krb_msg=No
@@ -189,6 +221,21 @@ AH_TEMPLATE(HAVE_KEYUTILS, [define if your system supports the Linux keyring fun
 AC_CHECK_LIB(keyutils, keyctl_search, [ AC_DEFINE(HAVE_KEYUTILS)
 					LDFLAGS="$LDFLAGS -lkeyutils" ])
 
+# Unix credentials selector
+AH_TEMPLATE(UNIX_AUTH_STYLE, [undefine for no Unix auth, 1 for Linux style, 2 for BSD style])
+AC_CHECK_MEMBER(struct ucred.pid, [ linuxcreds=y ], [ linuxcreds=n ], [#include <sys/socket.h>])
+AC_CHECK_FUNC(getpeereid, [ bsdcreds=y ], [ bsdcreds=n ])
+AC_MSG_CHECKING([for Unix auth style])
+if test $linuxcreds = y; then
+	AC_DEFINE(UNIX_AUTH_STYLE, 1)
+	AC_MSG_RESULT(linux)
+elif test $bsdcreds = y; then
+	AC_DEFINE(UNIX_AUTH_STYLE, 2)
+	AC_MSG_RESULT(bsd)
+else
+	AC_MSG_RESULT(none)
+fi
+
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
@@ -200,7 +247,7 @@ AC_TYPE_SIGNAL
 
 CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
-AC_SUBST([clients extlibs])
+AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -211,6 +258,7 @@ lib/guile/Makefile
 lib/guile/dolcon/Makefile
 clients/Makefile
 clients/gtk2/Makefile
+clients/tty/Makefile
 clients/gnome-trans-applet/Makefile
 clients/gaim/Makefile
 include/Makefile
@@ -231,6 +279,7 @@ echo
 echo "    Kerberos 5 support:      $krb_msg"
 echo "    GTK2 user interface:     $gtk2ui_msg"
 echo "    GTK2 progress bars:      $gtk2pbar_msg"
+echo "    Dolconf configurator:    $dolconf_msg"
 echo "    Guile extension library: $guile_msg"
 echo "    GNOME transfer applet:   $gnometrapplet_msg"
 echo "    Gaim chat plugin:        $gaimplugin_msg"