File cyrus-sasl.dif of Package cyrus-sasl

Overview Repositories Revisions Requests Users Attributes Meta

File cyrus-sasl.dif of Package cyrus-sasl (Revision 69a39cb61658d8ea1b5953b14ebcf11f)

Currently displaying revision 69a39cb61658d8ea1b5953b14ebcf11f , Show latest

Index: m4/cyrus.m4
===================================================================
--- m4/cyrus.m4.orig
+++ m4/cyrus.m4
@@ -36,7 +36,7 @@ AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
     SAVE_LDFLAGS="${LDFLAGS}"
     LDFLAGS="-R /usr/lib"
     AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+#  	LDFLAGS="-Wl,-rpath,/usr/lib"
     AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"],
     [andrew_cv_runpath_switch="none"])
     ])
Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -44,6 +44,7 @@ ACLOCAL_AMFLAGS = -I m4
 #
 ################################################################
 
+ACLOCAL_AMFLAGS=-I config -I cmulocal
 if SASLAUTHD
 SAD = saslauthd
 else
Index: sasldb/Makefile.am
===================================================================
--- sasldb/Makefile.am.orig
+++ sasldb/Makefile.am
@@ -57,3 +57,9 @@ EXTRA_libsasldb_la_SOURCES = $(extra_com
 libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
 libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
 libsasldb_la_LDFLAGS = -no-undefined
+
+# avoid these two files created at the same time, they use both the same
+# dep file
+db_berkeley.lo: db_berkeley.o
+allockey.lo: allockey.o
+
Index: saslauthd/Makefile.am
===================================================================
--- saslauthd/Makefile.am.orig
+++ saslauthd/Makefile.am
@@ -1,4 +1,5 @@
 AUTOMAKE_OPTIONS = 1.7
+ACLOCAL_AMFLAGS=-I ../config -I ../cmulocal
 sbin_PROGRAMS	= saslauthd testsaslauthd
 EXTRA_PROGRAMS  = saslcache

Places

File cyrus-sasl.dif of Package cyrus-sasl (Revision 69a39cb61658d8ea1b5953b14ebcf11f)

Places