53 lines
2.1 KiB
Diff
53 lines
2.1 KiB
Diff
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -1046,13 +1046,16 @@
|
|
be found [[LIBDIR/sasl2]] ],
|
|
plugindir=$withval,
|
|
plugindir='${libdir}/sasl2')
|
|
+AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
|
|
AC_SUBST(plugindir)
|
|
|
|
AC_ARG_WITH(configdir, [ --with-configdir=DIR set the directory where config files will
|
|
be found [PLUGINDIR:SYSCONFDIR/sasl2] ],
|
|
configdir=$withval,
|
|
configdir='${plugindir}:${sysconfdir}/sasl2')
|
|
+AC_DEFINE_UNQUOTED(CONFIGDIR, "$configdir", [Runtime config file location])
|
|
AC_SUBST(configdir)
|
|
+
|
|
FULL_EXPAND_VARIABLE(sasl_bindir, "$bindir")
|
|
AC_DEFINE_UNQUOTED(BINDIR, "$sasl_bindir", [Runtime executables location])
|
|
|
|
--- a/lib/Makefile.am
|
|
+++ b/lib/Makefile.am
|
|
@@ -46,7 +46,7 @@
|
|
sasl_version = 3:0:0
|
|
|
|
AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_srcdir)/plugins \
|
|
- -I$(top_builddir)/include -I$(top_srcdir)/sasldb -I$(top_srcdir)/common -DCONFIGDIR='"${configdir}"' -DPLUGINDIR='"${plugindir}"'
|
|
+ -I$(top_builddir)/include -I$(top_srcdir)/sasldb -I$(top_srcdir)/common
|
|
PLUGIN_COMMON_OBJS = $(top_builddir)/common/libplugin_common.la
|
|
|
|
EXTRA_DIST = windlopen.c dlopen.c staticopen.h NTMakefile
|
|
--- a/sample/Makefile.am
|
|
+++ b/sample/Makefile.am
|
|
@@ -42,7 +42,7 @@
|
|
#
|
|
################################################################
|
|
|
|
-AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_builddir)/include -DPLUGINDIR='"${plugindir}"'
|
|
+AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_builddir)/include
|
|
|
|
noinst_PROGRAMS = client server http_digest_client
|
|
EXTRA_PROGRAMS = sample-client sample-server
|
|
--- a/utils/Makefile.am
|
|
+++ b/utils/Makefile.am
|
|
@@ -89,7 +89,7 @@
|
|
libsfsasl2_la_LIBADD = sfsasl.lo
|
|
libsfsasl2_la_LDFLAGS = -version-info 1:0:0 -export-dynamic -rpath $(libdir)
|
|
|
|
-AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -I$(top_srcdir)/include -I$(top_builddir)/include @SASL_DB_INC@ -DPLUGINDIR='"${plugindir}"'
|
|
+AM_CPPFLAGS=-DLIBSASL_EXPORTS=1 -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
|
|
|