cyrus 2.2 from yesterday cvs

[Patrick Welche]

On Wed, Feb 19, 2003 at 09:20:22AM -0500, Rob Siemborski wrote:
> On Wed, 19 Feb 2003, Jure Pecar wrote:
> 
> > cyradm still does not compile to a working state outofthebox. Looks like
> > env variables like BDB_LIB and SASL_LIB are not passed down to perl/imap.
> > When exporting them by hand and going through standard 'perl Makefile.PL;
> > make; make install' it works.
> 
> Please supply a patch to fix this, as far as I can tell, the code that is
> there is passing the necessary enviornment variables.

I think I already posted something like this a long time ago... but
that was just to get things to compile..

In fact, I think those variables want to be jettisoned anyway!
There is now a check in configure.in:
    AC_MSG_WARN([Cannot compile perl utilities using static libsasl]) 
so all this monkey business in sasl2.m4 to set dynamic as opposed to
static cpp&ld flags is unnecessary.

Cheers,

Patrick

Index: cmulocal/sasl2.m4
===================================================================
RCS file: /cvs/src/cmulocal/sasl2.m4,v
retrieving revision 1.25
diff -u -r1.25 sasl2.m4
--- cmulocal/sasl2.m4	3 Feb 2003 17:09:08 -0000	1.25
+++ cmulocal/sasl2.m4	19 Feb 2003 20:05:03 -0000
@@ -89,7 +89,7 @@
 dnl generally want to have (e.g. if static is requested, make it that,
 dnl otherwise make it dynamic.
 
-dnl We also want to creat LIB_DYN_SASL and DYNSASLFLAGS.
+dnl We also want to create LIB_DYN_SASL and DYNSASLFLAGS.
 
 dnl Also sets using_static_sasl to "no" "static" or "staticonly"
 
@@ -169,15 +169,15 @@
 
 	if test "$ac_cv_found_sasl" = "yes"; then
 	    if test "$ac_cv_sasl_where_lib" != ""; then
-	        CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, DYNLIB_SASL)
+	        CMU_ADD_LIBPATH_TO($ac_cv_sasl_where_lib, LIB_DYN_SASL)
 	    fi
-	    DYNLIB_SASL="$DYNLIB_SASL -lsasl2"
+	    LIB_DYN_SASL="$LIB_DYN_SASL -lsasl2"
 	    if test "$using_static_sasl" != "static"; then
-		LIB_SASL=$DYNLIB_SASL
+		LIB_SASL=$LIB_DYN_SASL
 		SASLFLAGS=$DYNSASLFLAGS
 	    fi
 	else
-	    DYNLIB_SASL=""
+	    LIB_DYN_SASL=""
 	    DYNSASLFLAGS=""
 	    using_static_sasl="staticonly"
 	fi
Index: perl/Makefile.in
===================================================================
RCS file: /cvs/src/cyrus/perl/Makefile.in,v
retrieving revision 1.12
diff -u -r1.12 Makefile.in
--- perl/Makefile.in	2 Jan 2003 17:27:35 -0000	1.12
+++ perl/Makefile.in	19 Feb 2003 20:05:07 -0000
@@ -52,8 +52,8 @@
 INSTALL = @INSTALL@
 
 # Note that we use the *dynamic* sasl libraries
-SASL_LIB=@LIB_DYN_SASL@
-SASL_INC=@DYNSASLFLAGS@
+SASL_LIB=@LDFLAGS@ @LIB_DYN_SASL@
+SASL_INC=@CPPFLAGS@ @DYNSASLFLAGS@
 OPENSSL_LIB=@OPENSSL_LIB@
 OPENSSL_INC=@OPENSSL_INC@
 
Index: perl/sieve/Makefile.in
===================================================================
RCS file: /cvs/src/cyrus/perl/sieve/Makefile.in,v
retrieving revision 1.14
diff -u -r1.14 Makefile.in
--- perl/sieve/Makefile.in	22 Jul 2002 16:16:09 -0000	1.14
+++ perl/sieve/Makefile.in	19 Feb 2003 20:05:07 -0000
@@ -63,8 +63,8 @@
 cyrus_prefix = @cyrus_prefix@
 
 # Note that we use the *dynamic* sasl libraries
-SASL_LIB=@LIB_DYN_SASL@
-SASL_INC=@DYNSASLFLAGS@
+SASL_LIB=@LDFLAGS@ @LIB_DYN_SASL@
+SASL_INC=@CPPFLAGS@ @DYNSASLFLAGS@
 OPENSSL_LIB=@OPENSSL_LIB@
 OPENSSL_INC=@OPENSSL_INC@