X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=configure.in;h=70dac65fbde9e0e7f95f49b8a7d8857892793d3f;hp=f769d865736cc3a8d58f185d6fd499b7dec6cea7;hb=6c42153ad9362cc676ea66563bf400d7511b3b68;hpb=2e691051f6a09db9a33e8be13c901b4f44f3fd1e

diff --git a/configure.in b/configure.in
index f769d86..70dac65 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,11 @@ VERSION=`sed -e 's/nmh-//' ${srcdir}/VERSION`
 echo "configuring for nmh-$VERSION"
 AC_SUBST(VERSION)dnl
 
+dnl What date of nmh are we building?
+DATE=`cat ${srcdir}/DATE`
+echo "configuring for nmh dated $DATE"
+AC_SUBST(DATE)dnl
+
 dnl --------------------------
 dnl CHECK COMMAND LINE OPTIONS
 dnl --------------------------
@@ -88,8 +93,11 @@ 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=<dir> Specify location of Cyrus SASL library for auth])
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   AC_DEFINE(CYRUS_SASL)dnl
+  sasl_support=yes
+else
+  sasl_support=no
 fi
 
 dnl What should be the default editor?
@@ -621,10 +629,19 @@ AC_SUBST(KRB4_LIBS)dnl
 dnl --------------------
 dnl CHECK FOR CYRUS SASL
 dnl --------------------
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
   if test x"$with_cyrus_sasl" != x"yes"; then
     SASL_INCLUDES="-I$with_cyrus_sasl/include"
     SASL_LIBS="-L$with_cyrus_sasl/lib"
+
+    dnl Do OS-specific hardcoding of SASL shared library path into executables,
+    dnl so user isn't forced to set environment variables like Solaris'
+    dnl LD_LIBRARY_PATH.
+    case "$target_os" in
+      solaris*)
+	SASL_LIBS="$SASL_LIBS -R$with_cyrus_sasl/lib"
+	;;
+    esac
   fi
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $SASL_LIBS"
@@ -872,5 +889,6 @@ default smtp servers       : ${smtpservers}
 default editor             : ${editorpath}
 default pager              : ${pagerpath}
 email address masquerading : ${masquerade}
-pop is enabled             : ${pop_kinds}"
+pop is enabled             : ${pop_kinds}
+SASL support               : ${sasl_support}"
 echo ""