source: scripts/patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch@ 60ba5e6

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 60ba5e6 was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move

  • Property mode set to 100644
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  
    7878
    7979framedir = /Library/Frameworks/SASL2.framework
    8080install-exec-local: $(INSTALLOSX)
    81         @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
     81        @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
    8282          echo "********************************************************"; \
    8383          echo "* WARNING:"; \
    84           echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
     84          echo "* Plugins are being installed into $(libdir)/sasl2,"; \
    8585          echo "* but the library will look for them in $(plugindir)."; \
    8686          echo "* You need to make sure that the plugins will eventually"; \
    8787          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,"; \
    8989          echo "* but this may not be appropriate for your site, so this"; \
    9090          echo "* installation procedure won't do it for you."; \
    9191          echo "*"; \
  • cyrus-sasl-2.1.

    diff -uNr cyrus-sasl-2.1.20-orig/Makefile.in cyrus-sasl-2.1.20/Makefile.in
    old new  
    656656        @find $(distdir) -exec chmod o+w {} ';'
    657657        @find $(distdir) -name CVS -print | xargs -t rm -rf
    658658install-exec-local: $(INSTALLOSX)
    659         @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
     659        @if test "$(plugindir)" != "$(libdir)/sasl2"; then \
    660660          echo "********************************************************"; \
    661661          echo "* WARNING:"; \
    662           echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
     662          echo "* Plugins are being installed into $(libdir)/sasl2,"; \
    663663          echo "* but the library will look for them in $(plugindir)."; \
    664664          echo "* You need to make sure that the plugins will eventually"; \
    665665          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,"; \
    667667          echo "* but this may not be appropriate for your site, so this"; \
    668668          echo "* installation procedure won't do it for you."; \
    669669          echo "*"; \
  • cyrus-sasl-2.1.

    diff -uNr cyrus-sasl-2.1.20-orig/configure cyrus-sasl-2.1.20/configure
    old new  
    904904  --with-pgsql=PATH       use PostgreSQL from PATH
    905905  --with-sqlite=PATH       use SQLite from PATH
    906906  --with-plugindir=DIR    set the directory where plugins will
    907                           be found [/usr/lib/sasl2]
     907                          be found [LIBDIR/sasl2]
    908908  --with-rc4              use internal rc4 routines [yes]
    909909  --with-dmalloc=DIR      with DMALLOC support (for test applications) [no]
    910910  --with-sfio=DIR         with SFIO support (for smtptest/libsfsasl) [no]
     
    1143711437  withval="$with_plugindir"
    1143811438  plugindir=$withval
    1143911439else
    11440   plugindir=/usr/lib/sasl2
     11440  plugindir=${libdir}/sasl2
    1144111441fi;
    1144211442
    1144311443cat >>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  
    787787AC_SUBST(SASL_STATIC_LIBS)
    788788
    789789AC_ARG_WITH(plugindir, [  --with-plugindir=DIR    set the directory where plugins will
    790                           be found [[/usr/lib/sasl2]] ],
     790                          be found [[LIBDIR/sasl2]] ],
    791791  plugindir=$withval,
    792   plugindir=/usr/lib/sasl2)
     792  plugindir=${libdir}/sasl2)
    793793AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
    794794AC_SUBST(plugindir)
    795795
  • plugins/Makefile.am

    diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
    old new  
    7373
    7474common_sources = plugin_common.c plugin_common.h
    7575
    76 sasldir = $(prefix)/lib/sasl2
     76sasldir = $(libdir)/sasl2
    7777sasl_LTLIBRARIES = @SASL_MECHS@
    7878EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
    7979        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  
    255255
    256256common_sources = plugin_common.c plugin_common.h
    257257
    258 sasldir = $(prefix)/lib/sasl2
     258sasldir = $(libdir)/sasl2
    259259sasl_LTLIBRARIES = @SASL_MECHS@
    260260EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
    261261        libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
Note: See TracBrowser for help on using the repository browser.