| [617118d] | 1 | Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
|
|---|
| 2 | Date: 2004-10-25
|
|---|
| 3 | Initial Package Version: 2.1.20 (may apply to earlier)
|
|---|
| 4 | Origin: Ryan Oliver
|
|---|
| 5 | Description: This patch ensures that the plugin directory gets located
|
|---|
| 6 | under the same directory specified with "--with-libdir=" .
|
|---|
| 7 | diff -uNr cyrus-sasl-2.1.20-orig/Makefile.in cyrus-sasl-2.1.20/Makefile.in
|
|---|
| 8 | --- cyrus-sasl-2.1.20-orig/Makefile.in 2004-10-25 06:21:09.000000000 +1000
|
|---|
| 9 | +++ cyrus-sasl-2.1.20/Makefile.in 2004-10-25 21:37:53.780833136 +1000
|
|---|
| 10 | @@ -656,14 +656,14 @@
|
|---|
| 11 | @find $(distdir) -exec chmod o+w {} ';'
|
|---|
| 12 | @find $(distdir) -name CVS -print | xargs -t rm -rf
|
|---|
| 13 | install-exec-local: $(INSTALLOSX)
|
|---|
| 14 | - @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
|
|---|
| 15 | + @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
|
|---|
| 16 | echo "********************************************************"; \
|
|---|
| 17 | echo "* WARNING:"; \
|
|---|
| 18 | - echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
|
|---|
| 19 | + echo "* Plugins are being installed into $(libdir)/sasl2,"; \
|
|---|
| 20 | echo "* but the library will look for them in $(plugindir)."; \
|
|---|
| 21 | echo "* You need to make sure that the plugins will eventually"; \
|
|---|
| 22 | echo "* be in $(plugindir) -- the easiest way is to make a"; \
|
|---|
| 23 | - echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
|
|---|
| 24 | + echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
|
|---|
| 25 | echo "* but this may not be appropriate for your site, so this"; \
|
|---|
| 26 | echo "* installation procedure won't do it for you."; \
|
|---|
| 27 | echo "*"; \
|
|---|
| 28 | diff -uNr cyrus-sasl-2.1.20-orig/configure cyrus-sasl-2.1.20/configure
|
|---|
| 29 | --- cyrus-sasl-2.1.20-orig/configure 2004-10-25 06:21:08.000000000 +1000
|
|---|
| 30 | +++ cyrus-sasl-2.1.20/configure 2004-10-25 21:38:31.938032360 +1000
|
|---|
| 31 | @@ -904,7 +904,7 @@
|
|---|
| 32 | --with-pgsql=PATH use PostgreSQL from PATH
|
|---|
| 33 | --with-sqlite=PATH use SQLite from PATH
|
|---|
| 34 | --with-plugindir=DIR set the directory where plugins will
|
|---|
| 35 | - be found [/usr/lib/sasl2]
|
|---|
| 36 | + be found [LIBDIR/sasl2]
|
|---|
| 37 | --with-rc4 use internal rc4 routines [yes]
|
|---|
| 38 | --with-dmalloc=DIR with DMALLOC support (for test applications) [no]
|
|---|
| 39 | --with-sfio=DIR with SFIO support (for smtptest/libsfsasl) [no]
|
|---|
| 40 | @@ -11437,7 +11437,7 @@
|
|---|
| 41 | withval="$with_plugindir"
|
|---|
| 42 | plugindir=$withval
|
|---|
| 43 | else
|
|---|
| 44 | - plugindir=/usr/lib/sasl2
|
|---|
| 45 | + plugindir=${libdir}/sasl2
|
|---|
| 46 | fi;
|
|---|
| 47 |
|
|---|
| 48 | cat >>confdefs.h <<_ACEOF
|
|---|
| 49 | diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.in cyrus-sasl-2.1.20/plugins/Makefile.in
|
|---|
| 50 | --- cyrus-sasl-2.1.20-orig/plugins/Makefile.in 2004-10-25 06:21:09.000000000 +1000
|
|---|
| 51 | +++ cyrus-sasl-2.1.20/plugins/Makefile.in 2004-10-25 21:37:53.787832072 +1000
|
|---|
| 52 | @@ -255,7 +255,7 @@
|
|---|
| 53 |
|
|---|
| 54 | common_sources = plugin_common.c plugin_common.h
|
|---|
| 55 |
|
|---|
| 56 | -sasldir = $(prefix)/lib/sasl2
|
|---|
| 57 | +sasldir = $(libdir)/sasl2
|
|---|
| 58 | sasl_LTLIBRARIES = @SASL_MECHS@
|
|---|
| 59 | EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
|
|---|
| 60 | libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
|
|---|
