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

diff --git a/configure.in b/configure.in
index 3ab313e..0fc4a01 100644
--- a/configure.in
+++ b/configure.in
@@ -1,175 +1,177 @@
 AC_INIT(daemon/main.c)
-AM_INIT_AUTOMAKE([doldaconnect], [0.4])
+AM_INIT_AUTOMAKE([doldaconnect], [0.5])
 AM_CONFIG_HEADER(config.h)
 
+DOLDA_AC_GROUP([Checking build chain])
+
 AC_PROG_CC
+AC_PROG_CC_C_O
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 
+DOLDA_AC_GROUP([Configuring gettext])
+
 AM_GNU_GETTEXT_VERSION(0.12.1)
 AM_GNU_GETTEXT([external])
 
+DOLDA_AC_GROUP([Configuring libtool])
+
 # 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
+
+DOLDA_AC_GROUP([Checking required libraries])
 
-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
 
-AC_CHECK_PROG([PKG_CONFIG], pkg-config, yes, no)
+DOLDA_AC_GROUP([Checking optional libraries])
 
-# Gtk 2.0 check
-AC_ARG_WITH(gtk2, [  --with-gtk2             Enable GTK2 support])
-if test "$with_gtk2" = no; then
-	HAS_GTK2=no
+# PAM check
+pam_msg=no
+AH_TEMPLATE(HAVE_PAM, [define to compile support for PAM authentication])
+AC_ARG_WITH(pam, [  --with-pam              Enable PAM support])
+DOLDA_PKG([HAS_PAM], [test "$with_pam" = no && HAS_PAM=no],
+		     [AC_CHECK_LIB(pam, pam_start, , [HAS_PAM=no])])
+if test "$with_pam" = yes -a "$HAS_PAM" = no; then
+	AC_MSG_ERROR([*** cannot find PAM on this system])
 fi
-if test "$HAS_GTK2" != no; then
-	if test "$PKG_CONFIG" = yes; then
-		AC_MSG_CHECKING([for GTK2 package information])
-		if pkg-config --modversion gtk+-2.0 >/dev/null 2>&1; then
-			AC_MSG_RESULT(yes)
-        	else
-			AC_MSG_RESULT(no)
-        		HAS_GTK2=no
-        	fi
-		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`)
-		fi
-        	if test "$HAS_GTK2" = yes; then
-        		cpp_bak="$CPPFLAGS"
-        		CPPFLAGS="$CPPFLAGS `pkg-config --cflags gtk+-2.0`"
-        		AC_CHECK_HEADER(gtk/gtk.h, [], [HAS_GTK2=no])
-        		CPPFLAGS="$cpp_bak"
-        	fi
-	else
-		HAS_GTK2=no
-        fi
+if test "$HAS_PAM" = yes; then
+	AC_DEFINE(HAVE_PAM)
+	pam_msg=yes
 fi
+
+# Gtk 2.0 check
+AC_ARG_WITH(gtk2, [  --with-gtk2             Enable GTK2 support])
+DOLDA_PKG([HAS_GTK2], [test "$with_gtk2" = no && HAS_GTK2=no],
+		      [PKG_CHECK_MODULES(GTK2, gtk+-2.0, [], [HAS_GTK2=no])],
+		      [AC_CHECK_LIB(gtk-x11-2.0, gtk_init, [:], [HAS_GTK2=no], $GTK2_LIBS)],
+		      [DOLDA_CHECK_HEADER(gtk/gtk.h, [], [HAS_GTK2=no], $GTK2_CFLAGS)])
 if test "$with_gtk2" = yes -a "$HAS_GTK2" = no; then
 	AC_MSG_ERROR([*** cannot find GTK2 on this system])
 fi
 
 # libxml2 check
-AC_MSG_CHECKING([for libxml2 package information])
-if test "$PKG_CONFIG" = yes; then
-	if pkg-config --modversion libxml-2.0 >/dev/null 2>&1; then
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-		HAS_LIBXML=no
-	fi
-	if test "$HAS_LIBXML" != no; then
-		AC_CHECK_LIB(xml2, xmlReadFile, [HAS_LIBXML=yes], [HAS_LIBXML=no], `pkg-config --libs libxml-2.0`)
-	fi
-else
-	AC_MSG_RESULT(no)
-	HAS_LIBXML=no
+AC_ARG_WITH(libxml2, [  --with-libxml2          Enable libxml2 support])
+DOLDA_PKG([HAS_LIBXML], [test "$with_libxml2" = no && HAS_LIBXML=no],
+		      	[PKG_CHECK_MODULES(LIBXML, libxml-2.0, [], [HAS_LIBXML=no])],
+		       	[AC_CHECK_LIB(xml2, xmlReadFile, [:], [HAS_LIBXML=no], $LIBXML_LIBS)],
+		       	[DOLDA_CHECK_HEADER(libxml/parser.h, [], [HAS_LIBXML=no], $LIBXML_CFLAGS)])
+if test "$with_libxml" = yes -a "$HAS_LIBXML" = no; then
+   	AC_MSG_ERROR([*** cannot find libxml2 on this system])
 fi
 
-# Gtk GUI check
-gtk2ui_msg=No
-AC_ARG_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface])
-if test "$enable_gtk2ui" = yes; then
-	if test "$HAS_GTK2" = no; then
-		AC_MSG_ERROR([*** cannot build the GTK2 UI without a GTK2 library])
-	fi
-	if test "$HAS_LIBXML" = no; then
-		AC_MSG_ERROR([*** the GTK2 UI needs libxml2])
-	fi
+# libnotify check
+AH_TEMPLATE(HAVE_NOTIFY, [define to compile support for libnotify])
+AC_ARG_WITH(libnotify, [  --with-libnotify        Enable libnotify support])
+DOLDA_PKG([HAS_LIBNOTIFY], [test "$with_libnotify" = no && HAS_LIBNOTIFY=no],
+			   [PKG_CHECK_MODULES(LIBNOTIFY, libnotify, [], [HAS_LIBNOTIFY=no])],
+			   [AC_CHECK_LIB(notify, notify_init, [:], [HAS_LIBNOTIFY=no], $LIBNOTIFY_LIBS)])
+if test "$with_libnotify" = yes -a "$HAS_LIBNOTIFY" = no; then
+   	AC_MSG_ERROR([*** cannot find libnotify on this system])
 fi
-if test "$enable_gtk2ui" != no -a "$HAS_GTK2" = yes; then
-	clients="$clients gtk2"
-	gtk2ui_msg=Yes
+if test "$HAS_LIBNOTIFY" = yes; then
+   	AC_DEFINE(HAVE_NOTIFY)
 fi
 
+# libpanelapplet check
+DOLDA_PKG([HAS_LIBPANELAPPLET], [PKG_CHECK_MODULES(PANELAPPLET, libpanelapplet-2.0, [], [HAS_LIBPANELAPPLET=no])])
+
+# Gaim/Pidgin check
+DOLDA_PKG([HAS_LIBGAIM], [PKG_CHECK_MODULES(GAIM, gaim, [], [HAS_LIBGAIM=no])],
+			 [DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBGAIM=no], $GAIM_CFLAGS)])
+DOLDA_PKG([HAS_LIBPURPLE], [PKG_CHECK_MODULES(PURPLE, purple, [], [HAS_LIBPURPLE=no])],
+			   [DOLDA_CHECK_HEADER(plugin.h, [], [HAS_LIBPURPLE=no], $PURPLE_CFLAGS)])
+
+# Gtk GUI check
+DOLDA_ENABLE(gtk2ui, [  --enable-gtk2ui         Enable the GTK2 user interface], yes,
+		     [HAS_GTK2 HAS_LIBXML])
+AM_CONDITIONAL(CLI_GTK2, test "$enable_gtk2ui" = yes)
+
+# Dolconf check
+DOLDA_ENABLE(dolconf, [  --enable-dolconf        Build the configuration helper], yes,
+		      [HAS_GTK2])
+AM_CONDITIONAL(DOLCONF, test "$enable_dolconf" = yes)
+
 # Gtk progress bar check
-gtk2pbar_msg=No
 AH_TEMPLATE(ENABLE_GTK2PBAR, [define to compile GTK2 progress bars (experimental)])
-AC_ARG_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)])
+DOLDA_ENABLE(gtk2pbar, [  --enable-gtk2pbar       Enable GTK2 progress bars (experimental)], no,
+		       [HAS_GTK2 enable_gtk2ui])
 if test "$enable_gtk2pbar" = yes; then
-	if test "$HAS_GTK2" = no; then
-		AC_MSG_ERROR([*** cannot build GTK2 progress bars without GTK2])
-	fi
 	experimental=yes
-	gtk2pbar_msg=Yes
 	AC_DEFINE(ENABLE_GTK2PBAR)
 fi
 
 # Gnome applet check
-gnometrapplet_msg=No
-AC_ARG_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer applet (experimental)])
+DOLDA_ENABLE(gnomeapplet, [  --enable-gnomeapplet    Enable GNOME transfer applet (experimental)], no,
+			  [HAS_LIBPANELAPPLET])
 if test "$enable_gnomeapplet" = yes; then
 	experimental=yes
-	gnometrapplet_msg=Yes
-	clients="$clients gnome-trans-applet"
 fi
+AM_CONDITIONAL(CLI_GNOMEAPPLET, test "$enable_gnomeapplet" = yes)
 
 # Gaim plugin check
-gaimplugin_msg=No
-AC_ARG_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable GNOME transfer applet (experimental)])
+gaimplugin_msg=
+DOLDA_ENABLE(gaimplugin, [  --enable-gaimplugin     Enable Gaim chat plugin (experimental)], no,
+			 [HAS_LIBGAIM])
 if test "$enable_gaimplugin" = yes; then
 	experimental=yes
-	gaimplugin_msg=Yes
-	clients="$clients gaim"
+	gaimplugin_msg="Gaim $gaimplugin_msg"
+fi
+AM_CONDITIONAL(CLI_GAIM, test "$enable_gaimplugin" = yes)
+DOLDA_ENABLE(pidginplugin, [  --enable-pidginplugin   Enable Pidgin chat plugin (experimental)], no,
+			   [HAS_LIBPURPLE])
+if test "$enable_pidginplugin" = yes; then
+	experimental=yes
+	gaimplugin_msg="Pidgin $gaimplugin_msg"
+fi
+AM_CONDITIONAL(CLI_PIDGIN, test "$enable_pidginplugin" = yes)
+if test -z "$gaimplugin_msg"; then
+   	gaimplugin_msg=none
 fi
 
 # Guile check (XXX: Shouldn't have to be enabled manually)
-guile_msg=No
+guile_msg=no
 if test "$with_guile" = yes; then
 	GUILE_FLAGS
 	extlibs="$extlibs guile"
-	guile_msg=Yes
+	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)
+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])
+krb_msg=no
+AH_TEMPLATE(HAVE_KRB5, [define to compile support for Kerberos 5 (not GSSAPI) authentication])
 AC_ARG_WITH(krb5, [  --with-krb5[=PATH]        Enable Kerberos 5 (not GSSAPI) authentication])
-if test "$with_krb5" != no; then
-	cpp_bak="$CPPFLAGS"
-	ld_bak="$LDFLAGS"
-	if test "$with_krb5" != yes; then
-		CPPFLAGS="$CPPFLAGS -I${with_krb5}/include"
-		LDFLAGS="$LDFLAGS -L${with_krb5}/lib"
-	fi
-	AC_CHECK_LIB(krb5, krb5_init_context, [HAS_KRB5=yes], [HAS_KRB5=no])
-	if test "$HAS_KRB5" = yes; then
-		AC_CHECK_HEADER(com_err.h, [HAS_COMERR=yes], [HAS_COMERR=no])
-		if test "$HAS_COMERR" = no; then
-			AC_CHECK_HEADER(et/com_err.h, [HAS_COMERR=yes; CPPFLAGS="$CPPFLAGS -I/usr/include/et"], [])
-		fi
-	fi
-	if test "$HAS_COMERR" = no; then
-		HAS_KRB5=no
-	fi
-	if test "$HAS_KRB5" = no; then
-		CPPFLAGS="$cpp_bak"
-		LDFLAGS="$ld_bak"
-	fi
-fi
-KRB5_LDADD=
-if test -n "$with_krb5" -a "$with_krb5" != no -a "$HAS_KRB5" != yes; then
-	AC_MSG_ERROR([*** cannot find Kerberos 5 on this system - try passing --with-krb5=/path/to/kerberos])
+AC_CHECK_PROG(KRBCONF, krb5-config, yes, no)
+DOLDA_PKG([HAS_COMERR], [AC_CHECK_HEADER(com_err.h, [COMERR_CFLAGS=""; HAS_COMERR=yes], [])],
+			[AC_CHECK_HEADER(et/com_err.h, [COMERR_CFLAGS="-I/usr/include/et"; HAS_COMERR=yes], [])],
+			[HAS_COMERR=no])
+DOLDA_PKG([HAS_KRB5], [test "$with_krb5" = no && HAS_KRB5=no],
+		      [test "$KRBCONF" != yes && HAS_KRB5=no],
+		      [test "$HAS_COMERR" = no && HAS_KRB5=no],
+		      [KRB5_LIBS="`krb5-config --libs krb5`"
+		       KRB5_CFLAGS="`krb5-config --cflags krb5` $COMERR_CFLAGS"]
+		      [AC_CHECK_LIB(krb5, krb5_init_context, [:], [HAS_KRB5=no], $KRB5_LIBS)],
+		      [DOLDA_CHECK_HEADER(krb5.h, [], [HAS_KRB5=no], $KRB5_CFLAGS)])
+if test -n "$with_krb5" -a "$with_krb5" != no -a "$HAS_KRB5" = no; then
+	AC_MSG_ERROR([*** cannot find Kerberos 5 on this system])
 fi
 if test "$with_krb5" != no -a "$HAS_KRB5" = yes; then
 	AC_DEFINE(HAVE_KRB5)
-	KRB5_LDADD=-lkrb5
-	krb_msg=Yes
+	krb_msg=yes
 fi
-AC_SUBST([KRB5_LDADD])
+AC_SUBST([KRB5_LIBS KRB5_CFLAGS])
+
+DOLDA_AC_GROUP([Checking operating system features])
 
 # Misc. functions checks
 AC_CHECK_FUNC(vswprintf, , AC_MSG_ERROR([*** must have vswprintf]))
@@ -189,6 +191,23 @@ 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
+
+DOLDA_AC_GROUP([Checking standard headers])
+
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_SYS_WAIT
@@ -200,7 +219,9 @@ AC_TYPE_SIGNAL
 
 CPPFLAGS="-I\$(top_srcdir)/include $CPPFLAGS"
 
-AC_SUBST([clients extlibs])
+DOLDA_AC_GROUP([Writing output])
+
+AC_SUBST([extlibs])
 AC_OUTPUT([
 Makefile
 autopackage/Makefile
@@ -211,14 +232,18 @@ lib/guile/Makefile
 lib/guile/dolcon/Makefile
 clients/Makefile
 clients/gtk2/Makefile
+clients/tty/Makefile
 clients/gnome-trans-applet/Makefile
 clients/gaim/Makefile
+clients/gui-shell/Makefile
 include/Makefile
 include/doldaconnect/Makefile
 doc/Makefile
 doc/man/Makefile
 po/Makefile.in
 config/Makefile
+config/cmd/Makefile
+config/util/Makefile
 contrib/Makefile
 autopackage/dolcon.apspec
 autopackage/dcuilib.apspec
@@ -228,11 +253,13 @@ autopackage/dcguile.apspec
 echo
 echo "Dolda Connect has been configured with the following settings:"
 echo
+echo "    PAM support:             $pam_msg"
 echo "    Kerberos 5 support:      $krb_msg"
-echo "    GTK2 user interface:     $gtk2ui_msg"
-echo "    GTK2 progress bars:      $gtk2pbar_msg"
+echo "    GTK2 user interface:     $enable_gtk2ui"
+echo "    GTK2 progress bars:      $enable_gtk2pbar"
+echo "    Dolconf configurator:    $enable_dolconf"
 echo "    Guile extension library: $guile_msg"
-echo "    GNOME transfer applet:   $gnometrapplet_msg"
+echo "    GNOME transfer applet:   $enable_gnomeapplet"
 echo "    Gaim chat plugin:        $gaimplugin_msg"
 echo