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

diff --git a/configure.in b/configure.in
index 0a8dd6d..691b9e2 100644
--- a/configure.in
+++ b/configure.in
@@ -14,14 +14,11 @@ m4_defun([_LT_AC_LANG_F77_CONFIG], true)
 AM_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=
+clients=tty
 extlibs=
 experimental=no
 
@@ -75,6 +72,23 @@ else
 	HAS_LIBXML=no
 fi
 
+# 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
 AC_ARG_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface])
@@ -91,6 +105,19 @@ if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes; then
 	gtk2ui_msg=Yes
 fi
 
+# 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
+	AM_CONDITIONAL(DOLCONF, true)
+	dolconf_msg=Yes
+else
+	AM_CONDITIONAL(DOLCONF, false)
+fi
+
 # Gtk progress bar check
 gtk2pbar_msg=No
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
@@ -189,6 +216,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
@@ -211,6 +253,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 +274,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"