Use AC_PROG_LIBTOOL instead of AM_PROG_LIBTOOL.

[doldaconnect.git] / configure.in

diff --git a/configure.in b/configure.in
index 67dafb5..5e1fabf 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,14 +11,14 @@ 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]))
 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
 
@@ -216,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
@@ -238,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