source:
scripts/patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch@
bdb94d0
Last change on this file since bdb94d0 was 7f65c0e, checked in by , 19 years ago | |
---|---|
|
|
File size: 4.9 KB |
-
cyrus-sasl-2.1.
diff -uNr cyrus-sasl-2.1.20-orig/Makefile.am cyrus-sasl-2.1.20/Makefile.am
old new 78 78 79 79 framedir = /Library/Frameworks/SASL2.framework 80 80 install-exec-local: $(INSTALLOSX) 81 @if test "$(plugindir)" != "$( prefix)/lib/sasl2"; then \81 @if test "$(plugindir)" != "$(libdir)/sasl2"; then \ 82 82 echo "********************************************************"; \ 83 83 echo "* WARNING:"; \ 84 echo "* Plugins are being installed into $( prefix)/lib/sasl2,"; \84 echo "* Plugins are being installed into $(libdir)/sasl2,"; \ 85 85 echo "* but the library will look for them in $(plugindir)."; \ 86 86 echo "* You need to make sure that the plugins will eventually"; \ 87 87 echo "* be in $(plugindir) -- the easiest way is to make a"; \ 88 echo "* symbolic link from $(plugindir) to $( prefix)/lib/sasl2,"; \88 echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \ 89 89 echo "* but this may not be appropriate for your site, so this"; \ 90 90 echo "* installation procedure won't do it for you."; \ 91 91 echo "*"; \ -
cyrus-sasl-2.1.
diff -uNr cyrus-sasl-2.1.20-orig/Makefile.in cyrus-sasl-2.1.20/Makefile.in
old new 656 656 @find $(distdir) -exec chmod o+w {} ';' 657 657 @find $(distdir) -name CVS -print | xargs -t rm -rf 658 658 install-exec-local: $(INSTALLOSX) 659 @if test "$(plugindir)" != "$( prefix)/lib/sasl2"; then \659 @if test "$(plugindir)" != "$(libdir)/sasl2"; then \ 660 660 echo "********************************************************"; \ 661 661 echo "* WARNING:"; \ 662 echo "* Plugins are being installed into $( prefix)/lib/sasl2,"; \662 echo "* Plugins are being installed into $(libdir)/sasl2,"; \ 663 663 echo "* but the library will look for them in $(plugindir)."; \ 664 664 echo "* You need to make sure that the plugins will eventually"; \ 665 665 echo "* be in $(plugindir) -- the easiest way is to make a"; \ 666 echo "* symbolic link from $(plugindir) to $( prefix)/lib/sasl2,"; \666 echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \ 667 667 echo "* but this may not be appropriate for your site, so this"; \ 668 668 echo "* installation procedure won't do it for you."; \ 669 669 echo "*"; \ -
cyrus-sasl-2.1.
diff -uNr cyrus-sasl-2.1.20-orig/configure cyrus-sasl-2.1.20/configure
old new 904 904 --with-pgsql=PATH use PostgreSQL from PATH 905 905 --with-sqlite=PATH use SQLite from PATH 906 906 --with-plugindir=DIR set the directory where plugins will 907 be found [ /usr/lib/sasl2]907 be found [LIBDIR/sasl2] 908 908 --with-rc4 use internal rc4 routines [yes] 909 909 --with-dmalloc=DIR with DMALLOC support (for test applications) [no] 910 910 --with-sfio=DIR with SFIO support (for smtptest/libsfsasl) [no] … … 11437 11437 withval="$with_plugindir" 11438 11438 plugindir=$withval 11439 11439 else 11440 plugindir= /usr/lib/sasl211440 plugindir=${libdir}/sasl2 11441 11441 fi; 11442 11442 11443 11443 cat >>confdefs.h <<_ACEOF -
cyrus-sasl-2.1.
diff -uNr cyrus-sasl-2.1.20-orig/configure.in cyrus-sasl-2.1.20/configure.in
old new 787 787 AC_SUBST(SASL_STATIC_LIBS) 788 788 789 789 AC_ARG_WITH(plugindir, [ --with-plugindir=DIR set the directory where plugins will 790 be found [[ /usr/lib/sasl2]] ],790 be found [[LIBDIR/sasl2]] ], 791 791 plugindir=$withval, 792 plugindir= /usr/lib/sasl2)792 plugindir=${libdir}/sasl2) 793 793 AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location]) 794 794 AC_SUBST(plugindir) 795 795 -
plugins/Makefile.am
diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
old new 73 73 74 74 common_sources = plugin_common.c plugin_common.h 75 75 76 sasldir = $( prefix)/lib/sasl276 sasldir = $(libdir)/sasl2 77 77 sasl_LTLIBRARIES = @SASL_MECHS@ 78 78 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ 79 79 libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \ -
plugins/Makefile.in
diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.in cyrus-sasl-2.1.20/plugins/Makefile.in
old new 255 255 256 256 common_sources = plugin_common.c plugin_common.h 257 257 258 sasldir = $( prefix)/lib/sasl2258 sasldir = $(libdir)/sasl2 259 259 sasl_LTLIBRARIES = @SASL_MECHS@ 260 260 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \ 261 261 libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
Note:
See TracBrowser
for help on using the repository browser.