X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=inline;f=configure.in;h=4149de9db44dcebfde3d953b3ce9e4fc354bf1c1;hb=937a1d5deef2727cdf22ef3afda61fe766d234df;hp=c264d6eceba8bb801b170fdcf5d9e6116c66dd14;hpb=a70d216f2b3319bb3e0a774c06a2bf624cb6e119;p=mmh
diff --git a/configure.in b/configure.in
index c264d6e..4149de9 100644
--- a/configure.in
+++ b/configure.in
@@ -14,11 +14,13 @@ dnl define a macro or two
dnl ---------------------
AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+if test -n "$LIBTOOL" ; then
tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
if test x"$tmptest" != x ; then
GNU_LIBTOOL=1
AC_SUBST(GNU_LIBTOOL)dnl
fi
+fi
] )
@@ -50,17 +52,6 @@ if test x"$enable_nmh_debug" = x"yes"; then
enable_debug=yes
fi
-dnl Set the backup prefix
-undefine([backup-prefix])dnl
-AC_ARG_WITH([hash-backup],
- [ --with-hash-backup use # as the backup prefix (default: ,)])
-if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
- backup_prefix="#"
-else
- backup_prefix=","
-fi
-AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix")dnl
-
dnl Allow users to send email from addresses other than their default?
undefine([masquerade])dnl
AC_ARG_ENABLE(masquerade,
@@ -93,6 +84,34 @@ if test x"$enable_nmh_pop" = x"yes"; then
enable_pop=yes
fi
+dnl Do you want client-side support for using SASL for authentication?
+dnl Note that this code will be enabled for both POP and SMTP
+AC_ARG_WITH(cyrus-sasl,
+[ --with-cyrus-sasl=
Specify location of Cyrus SASL library for auth])
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+ AC_DEFINE(CYRUS_SASL)dnl
+fi
+
+dnl What should be the default editor?
+undefine([editor])dnl
+AC_ARG_WITH(editor,
+[ --with-editor=EDITOR specify the default editor])
+
+if test -n "$with_editor"; then
+ editorpath="$with_editor"
+fi
+
+dnl Set the backup prefix
+undefine([backup-prefix])dnl
+AC_ARG_WITH([hash-backup],
+ [ --with-hash-backup use # as the backup prefix (default: ,)])
+if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
+ backup_prefix="#"
+else
+ backup_prefix=","
+fi
+AC_DEFINE_UNQUOTED(BACKUP_PREFIX, "$backup_prefix")dnl
+
dnl Do you want support for hesiod
AC_ARG_WITH(hesiod,
[ --with-hesiod=PREFIX specify location of Hesiod])
@@ -120,23 +139,6 @@ fi
AC_SUBST(POPLIB)dnl
AC_SUBST(POPSED)dnl
-dnl What should be the default editor?
-undefine([editor])dnl
-AC_ARG_WITH(editor,
-[ --with-editor=EDITOR specify the default editor])
-
-if test -n "$with_editor"; then
- editorpath="$with_editor"
-fi
-
-dnl Do you want client-side support for using SASL for authentication?
-dnl Note that this code will be enabled for both POP and SMTP
-AC_ARG_WITH(cyrus-sasl,
-[ --with-cyrus-sasl= Specify location of Cyrus SASL library for auth])
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
- AC_DEFINE(CYRUS_SASL)dnl
-fi
-
dnl What method of posting should post use?
undefine([mts])dnl
AC_ARG_WITH(mts,
@@ -204,7 +206,16 @@ if test -n "$auto_cflags"; then
test -z "$CFLAGS" && CFLAGS=-g || CFLAGS="$CFLAGS -g"
fi
else
- test -z "$LDFLAGS" && LDFLAGS=-s
+ if test -z "$LDFLAGS"; then
+ case "$build_os" in
+ darwin*)
+ LDFLAGS=
+ ;;
+ *)
+ LDFLAGS=-s
+ ;;
+ esac
+ fi
if test -n "$GCC"; then
test -z "$CFLAGS" && CFLAGS="-Wall -O2" || CFLAGS="$CFLAGS -Wall -O2"
else
@@ -245,8 +256,8 @@ else
LINTFLAGS=""
fi
fi
-AC_SUBST(LINT)
-AC_SUBST(LINTFLAGS)
+AC_SUBST(LINT)dnl
+AC_SUBST(LINTFLAGS)dnl
dnl try to figure out which one we've got
AC_CHECK_PROG(LIBTOOL, libtool, libtool, , [$pathtmp])
@@ -445,7 +456,7 @@ if test $nmh_cv_header_termios_h_tiocgwinsz = no; then
nmh_cv_header_sys_ioctl_h_tiocgwinsz=yes,
nmh_cv_header_sys_ioctl_h_tiocgwinsz=no)])
if test $nmh_cv_header_sys_ioctl_h_tiocgwinsz = yes; then
- AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
+ AC_DEFINE(GWINSZ_IN_SYS_IOCTL)dnl
fi
fi
@@ -618,7 +629,7 @@ if test $nmh_cv_decl_ospeed_include_defines = no; then
fi
if test $nmh_cv_decl_ospeed_include_defines = yes; then
- AC_DEFINE(HAVE_OSPEED)
+ AC_DEFINE(HAVE_OSPEED)dnl
elif test $nmh_cv_decl_ospeed_must_define = yes; then
AC_DEFINE(HAVE_OSPEED)
AC_DEFINE(MUST_DEFINE_OSPEED)
@@ -777,10 +788,8 @@ dnl ----------------
dnl OUTPUT MAKEFILES
dnl ----------------
AC_OUTPUT(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
- zotnet/Makefile zotnet/mts/Makefile \
mts/Makefile mts/smtp/Makefile \
- mts/sendmail/Makefile mts/mmdf/Makefile etc/Makefile \
- docs/Makefile man/Makefile, \
+ etc/Makefile docs/Makefile man/Makefile, \
[test -z "$CONFIG_HEADERS" || echo > stamp-h])
dnl Umm, what's the point of these assignments?? --