forked from pool/cyrus-sasl
Marcus Meissner
5e1a38d881
- Ensure libraries and tools are built with LFS and include config.h in all C files. - remove rpath - Move some doc files to devel package and to cyrus-sasl-saslauthd. - Ensure libraries and tools are built with LFS and include config.h in all C files. OBS-URL: https://build.opensuse.org/request/show/120534 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=30
84 lines
3.0 KiB
Diff
84 lines
3.0 KiB
Diff
--- configure.in.orig
|
|
+++ configure.in
|
|
@@ -84,7 +84,9 @@ AC_ARG_ENABLE(obsolete_cram_attr,
|
|
enable_obsolete_cram_attr=$enableval,
|
|
enable_obsolete_cram_attr=yes)
|
|
|
|
-AC_PROG_CC
|
|
+AC_PROG_CC_STDC
|
|
+AC_USE_SYSTEM_EXTENSIONS
|
|
+AC_SYS_LARGEFILE
|
|
AC_PROG_CPP
|
|
AC_PROG_AWK
|
|
AC_PROG_LN_S
|
|
--- saslauthd/configure.in.orig
|
|
+++ saslauthd/configure.in
|
|
@@ -19,7 +19,9 @@ AM_INIT_AUTOMAKE(saslauthd,2.1.25)
|
|
CMU_INIT_AUTOMAKE
|
|
|
|
dnl Checks for programs.
|
|
-AC_PROG_CC
|
|
+AC_PROG_CC_STDC
|
|
+AC_USE_SYSTEM_EXTENSIONS
|
|
+AC_SYS_LARGEFILE
|
|
AC_PROG_CPP
|
|
AC_PROG_AWK
|
|
AC_PROG_MAKE_SET
|
|
--- plugins/Makefile.am.orig
|
|
+++ plugins/Makefile.am
|
|
@@ -49,7 +49,8 @@
|
|
plugin_version = 2:25:0
|
|
|
|
INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
|
|
-AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
|
|
+AM_CPPFLAGS = -include $(top_builddir)/config.h
|
|
+AM_LDFLAGS = -module -shared -export-dynamic -rpath $(plugindir) -version-info $(plugin_version)
|
|
|
|
COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
|
|
|
|
--- lib/Makefile.am.orig
|
|
+++ lib/Makefile.am
|
|
@@ -43,7 +43,8 @@
|
|
# Library version info - here at the top, for sanity
|
|
sasl_version = 2:25:0
|
|
|
|
-INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
|
|
+
|
|
+AM_CPPFLAGS= -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
|
|
|
|
EXTRA_DIST = windlopen.c staticopen.h NTMakefile
|
|
EXTRA_LIBRARIES = libsasl2.a
|
|
--- saslauthd/Makefile.am.orig
|
|
+++ saslauthd/Makefile.am
|
|
@@ -26,7 +26,7 @@ saslcache_SOURCES = saslcache.c
|
|
|
|
EXTRA_DIST = saslauthd.8 saslauthd.mdoc config include \
|
|
getnameinfo.c getaddrinfo.c LDAP_SASLAUTHD
|
|
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include
|
|
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/../include
|
|
DEFS = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
|
|
|
|
|
|
--- utils/Makefile.am.orig
|
|
+++ utils/Makefile.am
|
|
@@ -89,7 +89,7 @@ libsfsasl2_la_SOURCES =
|
|
libsfsasl2_la_LIBADD = sfsasl.lo
|
|
libsfsasl2_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -rpath $(libdir)
|
|
|
|
-INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
|
+AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
|
EXTRA_DIST = saslpasswd2.8 sasldblistusers2.8 pluginviewer.8 sfsasl.h sfsasl.c smtptest.c testsuite.c pluginviewer.c NTMakefile
|
|
|
|
sfsasl.lo: sfsasl.c
|
|
--- sasldb/Makefile.am.orig
|
|
+++ sasldb/Makefile.am
|
|
@@ -44,7 +44,7 @@
|
|
# Note that this doesn't necessaraly follow the libsasl2 verison info
|
|
sasl_version = 1:25:0
|
|
|
|
-INCLUDES=-I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
|
+AM_CPPFLAGS= -include $(top_builddir)/config.h -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@
|
|
|
|
extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
|
|
|