File cyrus-sasl.dif of Package cyrus-sasl-saslauthd

Overview Repositories Revisions Requests Users Attributes Meta

File cyrus-sasl.dif of Package cyrus-sasl-saslauthd (Revision e65ac6c0317e3bf132415a210044121b)

Currently displaying revision e65ac6c0317e3bf132415a210044121b , Show latest

Index: cmulocal/cyrus.m4
===================================================================
--- cmulocal/cyrus.m4.orig
+++ cmulocal/cyrus.m4
@@ -37,7 +37,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
@@ -43,6 +43,7 @@ AUTOMAKE_OPTIONS = 1.7
 #
 ################################################################
 
+ACLOCAL_AMFLAGS=-I config -I cmulocal
 if SASLAUTHD
 SAD = saslauthd
 else
Index: sasldb/Makefile.am
===================================================================
--- sasldb/Makefile.am.orig
+++ sasldb/Makefile.am
@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
 
 extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
 
+AM_CFLAGS = "-fPIC"
 EXTRA_DIST = NTMakefile
 
 noinst_LTLIBRARIES = libsasldb.la
@@ -66,3 +67,8 @@ libsasldb.a: libsasldb.la $(SASL_DB_BACK
 	$(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
 
 
+# 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-saslauthd (Revision e65ac6c0317e3bf132415a210044121b)

Places