X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.in;h=76237e26810f52a37ec6f36fdc3564345293dbf0;hb=eeef255a56fa2a1551c88571cf4bc34eeb858ef8;hp=7da0780014bf7fec5ed6ca2575f3412e7f297c05;hpb=d3a67123c9d05b6d639adb0e6b4a874807602a6b;p=mmh

diff --git a/configure.in b/configure.in
index 7da0780..76237e2 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,19 @@ AC_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_SYSTEM
 
+dnl ---------------------
+dnl define a macro or two
+dnl ---------------------
+
+AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+  tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
+  if test x"$tmptest" != x  ; then
+    GNU_LIBTOOL=1
+    AC_SUBST(GNU_LIBTOOL)
+  fi
+] )
+  
+
 dnl What version of nmh are we building?
 VERSION=`sed -e 's/nmh-//' ${srcdir}/VERSION`
 echo "configuring for nmh-$VERSION"
@@ -155,9 +168,10 @@ dnl Look for `cut'
 pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
 AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
 
-dnl Look for libtool. A ranlib replacement on Mac OS X/Rhapsody where
-dnl either ranlib or ar is broken (not sure which)
-AC_PATH_PROG(LIBTOOL, libtool, no [$pathtmp])
+
+dnl try to figure out which one we've got
+AC_CHECK_PROG(LIBTOOL, libtool, libtool, , [$pathtmp])
+NMH_PROG_GNU_LIBTOOL
 
 dnl Check for lorder and tsort commands
 AC_CHECK_PROG(LORDER, lorder, lorder, no)dnl
@@ -266,7 +280,7 @@ fi
 dnl ...If it's not, we need to #define MAILGROUP to 1 and make inc setgid.
 if test x"$nmh_cv_mailspool_world_writable" = x"no"; then
   dnl do we really need both of these?
-  AC_DEFINE(MAILGROUP)
+  AC_DEFINE(MAILGROUP)dnl
   SETGID_MAIL=1
 fi
 AC_SUBST(SETGID_MAIL)dnl
@@ -363,6 +377,15 @@ AC_TRY_LINK([#include <setjmp.h>], [sigsetjmp((void *)0, 0);],
 
 AC_REPLACE_FUNCS(snprintf strerror strdup)
 
+dnl On AIX 4.1, snprintf() is defined in libc.a but there's no prototype in
+dnl <stdio.h> or elsewhere.  Apparently it's not officially supported (though it
+dnl seems to work perfectly and IBM apparently uses it in internal code).
+dnl Anyhow, if we omit our own snprintf() and vsnprintf() prototypes when we
+dnl HAVE_SNPRINTF, we get a billion warnings at compile time.  Use the C
+dnl preprocessor to preprocess stdio.h and make sure that there's actually a 
+dnl prototype. 
+AC_EGREP_HEADER(snprintf, stdio.h, AC_DEFINE(HAVE_SNPRINTF_PROTOTYPE))
+
 dnl -------------------
 dnl CHECK FOR LIBRARIES
 dnl -------------------