Dear List,
I'd hoped to look over the mailing-list archives and
current CVS source
before this point, but I haven't been able to see the archives yet
(something seems
to be misconfigured - I've send a message to the Responsible Parties).
It is therefore quite possible that this duplicates even more of other
people's
work than I currently suspect, and that it has already been broken by
subsequent development. Anyway, here is a patch based on
the 2.1.21 release.
I contrived to re-discover all by myself the
SASL_DB_BACKEND_STATIC_SRC{,S}
problem: I understand a patch for this is already floating around.
I haven't tried to separate out this change, as I don't know what
else the other patch may do.
There's a long back-history of people having trouble with builds from
$(SASL_STATIC_SRCS), typically failing with a complaint that sasldb.o
doesn't exist and can't be built. Quaintly, the problem goes away when
trying to reproduce it - 'make' completes with no related problems.
I believe I have a proper repair for this, and hope nobody has beaten
me to it!
The existing Makefile unfortunately tries to 'build' the objects by
first building a 'linksrcs' pseudo-target which creates
symlinks to these source files.
Unfortunately, it seems to want to inherit the build rules for
making the objects from the sources, but providing an explicit
rule for these cases over-rides it. The rule must not try to go
straight from the original source files to the object files (unless
it duplicates the source-to-object rules, in which case there would
be no need for the symlinks anyway). If 'make' is invoked again,
then the usual .c.o rule seems to apply (I ought to be able to
work out when and why and how, but for the moment the
mechanism escapes me).
What's needed is to define the symlinks as a target, and then
the usual .c.o rule applies to these (without invoking 'make' again!).
Thus, we replace
$(SASL_STATIC_OBJS): linksrcs
linksrcs:
-ln -s $(SASL_STATIC_SRCS) .
with
$(SASL_STATIC_OBJS): $(SASL_STATIC_SRCS)
$(SASL_STATIC_SRCS) :
-if test -e "$@" ; then true ; \
elif test -f ../plugins/"$@" ; then ln -s ../plugins/"$@" . ; \
elif test -f ../sasldb/"$@" ; then ln -s ../sasldb/"$@" . ; \
else false ; \
fi
where SASL_STATIC_SRCS is now defined with bare source file-names,
not paths.
The rest of the changes are all about removing the directory paths
from the shell variable SASL_STATIC_SRCS inside 'configure'.
As I'm patching a release, the patch includes configure and Makefile.in :
of course, as a "true" source patch it should generate these, but it's
surely harmless. Almost needless to say, the patch does make the
necessary changes to configure.in and Makefile.am too.
I'm actually too lazy to work out which of the m4 files is derived from
which (or whether they are really as full of duplication as they seem).
So I've patched the lot.
The 2-line offset in one of the hunks is the result of previously applying
another (independent) patch. It hardly seems worth correcting, since
the sources to which it will be applied have doubtless changed anyway.
Bernard
Leak.
The
#Output of diff -Nru cyrus-sasl-2.1.21/config/sasldb.m4{-old,}
--- cyrus-sasl-2.1.21/config/sasldb.m4-old 2005-05-07 05:10:28.000000000 +0100
+++ cyrus-sasl-2.1.21/config/sasldb.m4 2006-08-29 12:40:38.000000000 +0100
@@ -120,7 +120,7 @@
dnl will just fail to load anyway.
SASL_DB_BACKEND="db_none.lo"
SASL_DB_BACKEND_STATIC="db_none.o"
- SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
+ SASL_DB_BACKEND_STATIC_SRCS="db_none.c"
SASL_DB_UTILS=""
SASL_DB_MANS=""
SASL_DB_LIB=""
@@ -129,12 +129,12 @@
if test "$enable_static" = yes; then
if test "$dblib" != "none"; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
AC_DEFINE(STATIC_SASLDB,[],[Link SASLdb Staticly])
else
SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
fi
fi
#Output of diff -Nru cyrus-sasl-2.1.21/lib/Makefile.in{-old,}
--- cyrus-sasl-2.1.21/lib/Makefile.in-old 2006-08-29 11:50:46.000000000 +0100
+++ cyrus-sasl-2.1.21/lib/Makefile.in 2006-08-29 12:00:27.000000000 +0100
@@ -645,10 +645,14 @@
rm -f $@
ln -s .libs/$@ $@
-$(SASL_STATIC_OBJS): linksrcs
-
-linksrcs:
- -ln -s $(SASL_STATIC_SRCS) .
+$(SASL_STATIC_OBJS): $(SASL_STATIC_SRCS)
+
+$(SASL_STATIC_SRCS) :
+ -if test -e "$@" ; then true ; \
+ elif test -f ../plugins/"$@" ; then ln -s ../plugins/"$@" . ; \
+ elif test -f ../sasldb/"$@" ; then ln -s ../sasldb/"$@" . ; \
+ else false ; \
+ fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
#Output of diff -Nru cyrus-sasl-2.1.21/lib/Makefile.am{-old,}
--- cyrus-sasl-2.1.21/lib/Makefile.am-old 2006-08-29 11:50:46.000000000 +0100
+++ cyrus-sasl-2.1.21/lib/Makefile.am 2006-08-29 12:36:15.000000000 +0100
@@ -93,8 +93,12 @@
rm -f $@
ln -s .libs/$@ $@
-$(SASL_STATIC_OBJS): linksrcs
+$(SASL_STATIC_OBJS): $(SASL_STATIC_SRCS)
-linksrcs:
- -ln -s $(SASL_STATIC_SRCS) .
+$(SASL_STATIC_SRCS) :
+ -if test -e "$@" ; then true ; \
+ elif test -f ../plugins/"$@" ; then ln -s ../plugins/"$@" . ; \
+ elif test -f ../sasldb/"$@" ; then ln -s ../sasldb/"$@" . ; \
+ else false ; \
+ fi
#Output of diff -Nru cyrus-sasl-2.1.21/saslauthd/aclocal.m4{-old,}
--- cyrus-sasl-2.1.21/saslauthd/aclocal.m4-old 2005-05-15 06:58:46.000000000 +0100
+++ cyrus-sasl-2.1.21/saslauthd/aclocal.m4 2006-08-29 12:42:24.000000000 +0100
@@ -1737,7 +1737,7 @@
SASL_DB_BACKEND="db_${dblib}.lo"
SASL_DB_BACKEND_STATIC="db_${dblib}.o allockey.o"
-SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_${dblib}.c ../sasldb/allockey.c"
+SASL_DB_BACKEND_STATIC_SRCS="db_${dblib}.c allockey.c"
SASL_DB_UTILS="saslpasswd2 sasldblistusers2"
SASL_DB_MANS="saslpasswd2.8 sasldblistusers2.8"
@@ -1760,7 +1760,7 @@
dnl will just fail to load anyway.
SASL_DB_BACKEND="db_none.lo"
SASL_DB_BACKEND_STATIC="db_none.o"
- SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
+ SASL_DB_BACKEND_STATIC_SRCS="db_none.c"
SASL_DB_UTILS=""
SASL_DB_MANS=""
SASL_DB_LIB=""
@@ -1769,12 +1769,12 @@
if test "$enable_static" = yes; then
if test "$dblib" != "none"; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRC sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
AC_DEFINE(STATIC_SASLDB,[],[Link SASLdb Staticly])
else
SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
fi
fi
#Output of diff -Nru cyrus-sasl-2.1.21/saslauthd/configure{-old,}
--- cyrus-sasl-2.1.21/saslauthd/configure-old 2005-05-15 06:59:04.000000000 +0100
+++ cyrus-sasl-2.1.21/saslauthd/configure 2006-08-29 12:43:36.000000000 +0100
@@ -9243,7 +9243,7 @@
SASL_DB_BACKEND="db_${dblib}.lo"
SASL_DB_BACKEND_STATIC="db_${dblib}.o allockey.o"
-SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_${dblib}.c ../sasldb/allockey.c"
+SASL_DB_BACKEND_STATIC_SRCS="db_${dblib}.c allockey.c"
SASL_DB_UTILS="saslpasswd2 sasldblistusers2"
SASL_DB_MANS="saslpasswd2.8 sasldblistusers2.8"
@@ -9277,7 +9277,7 @@
echo "$as_me: WARNING: Disabling SASL authentication database support" >&2;}
SASL_DB_BACKEND="db_none.lo"
SASL_DB_BACKEND_STATIC="db_none.o"
- SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
+ SASL_DB_BACKEND_STATIC_SRCS="db_none.c"
SASL_DB_UTILS=""
SASL_DB_MANS=""
SASL_DB_LIB=""
@@ -9286,7 +9286,7 @@
if test "$enable_static" = yes; then
if test "$dblib" != "none"; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
cat >>confdefs.h <<\_ACEOF
@@ -9295,7 +9295,7 @@
else
SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
fi
fi
#Output of diff -Nru cyrus-sasl-2.1.21/configure{-old,}
--- cyrus-sasl-2.1.21/configure-old 2006-08-29 11:50:46.000000000 +0100
+++ cyrus-sasl-2.1.21/configure 2006-08-29 12:45:35.000000000 +0100
@@ -6478,7 +6478,7 @@
SASL_DB_BACKEND="db_${dblib}.lo"
SASL_DB_BACKEND_STATIC="db_${dblib}.o allockey.o"
-SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_${dblib}.c ../sasldb/allockey.c"
+SASL_DB_BACKEND_STATIC_SRCS="db_${dblib}.c allockey.c"
SASL_DB_UTILS="saslpasswd2 sasldblistusers2"
SASL_DB_MANS="saslpasswd2.8 sasldblistusers2.8"
@@ -6512,7 +6512,7 @@
echo "$as_me: WARNING: Disabling SASL authentication database support" >&2;}
SASL_DB_BACKEND="db_none.lo"
SASL_DB_BACKEND_STATIC="db_none.o"
- SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
+ SASL_DB_BACKEND_STATIC_SRCS="db_none.c"
SASL_DB_UTILS=""
SASL_DB_MANS=""
SASL_DB_LIB=""
@@ -6521,7 +6521,7 @@
if test "$enable_static" = yes; then
if test "$dblib" != "none"; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
cat >>confdefs.h <<\_ACEOF
@@ -6530,7 +6530,7 @@
else
SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
fi
fi
@@ -7397,7 +7397,7 @@
SASL_MECHS="$SASL_MECHS libcrammd5.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS cram.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/cram.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS cram.c"
cat >>confdefs.h <<\_ACEOF
#define STATIC_CRAMMD5
@@ -9032,7 +9032,7 @@
echo "${ECHO_T}enabled" >&6
SASL_MECHS="$SASL_MECHS libdigestmd5.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/digestmd5.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS digestmd5.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS digestmd5.o"
cat >>confdefs.h <<\_ACEOF
@@ -9068,7 +9068,7 @@
SASL_MECHS="$SASL_MECHS libotp.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/otp.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS otp.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS otp.o"
cat >>confdefs.h <<\_ACEOF
@@ -9337,7 +9337,7 @@
SASL_MECHS="$SASL_MECHS libsrp.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/srp.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS srp.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS srp.o"
cat >>confdefs.h <<\_ACEOF
@@ -9964,7 +9964,7 @@
echo "$as_me:$LINENO: result: enabled" >&5
echo "${ECHO_T}enabled" >&6
SASL_MECHS="$SASL_MECHS libkerberos4.la"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/kerberos4.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS kerberos4.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS kerberos4.o"
cat >>confdefs.h <<\_ACEOF
@@ -11159,7 +11159,7 @@
SASL_MECHS="$SASL_MECHS libgssapiv2.la"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS gssapi.c"
cmu_save_LIBS="$LIBS"
LIBS="$LIBS $GSSAPIBASE_LIBS"
@@ -11313,7 +11313,7 @@
SASL_MECHS="$SASL_MECHS libplain.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS plain.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/plain.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS plain.c"
cat >>confdefs.h <<\_ACEOF
#define STATIC_PLAIN
@@ -11342,7 +11342,7 @@
SASL_MECHS="$SASL_MECHS libanonymous.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS anonymous.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/anonymous.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS anonymous.c"
cat >>confdefs.h <<\_ACEOF
#define STATIC_ANONYMOUS
@@ -11369,7 +11369,7 @@
echo "${ECHO_T}enabled" >&6
SASL_MECHS="$SASL_MECHS liblogin.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/login.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS login.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS login.o"
cat >>confdefs.h <<\_ACEOF
@@ -11406,7 +11406,7 @@
SASL_MECHS="$SASL_MECHS libntlm.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/ntlm.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS ntlm.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS ntlm.o"
cat >>confdefs.h <<\_ACEOF
@@ -11444,7 +11444,7 @@
SASL_MECHS="$SASL_MECHS libpassdss.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS passdss.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/passdss.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS passdss.c"
cat >>confdefs.h <<\_ACEOF
#define STATIC_PASSDSS
@@ -11485,7 +11485,7 @@
echo "${ECHO_T}enabled" >&6
SASL_MECHS="$SASL_MECHS libsql.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS sql.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
cat >>confdefs.h <<\_ACEOF
@@ -12281,7 +12281,7 @@
SASL_MECHS="$SASL_MECHS libldapdb.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/ldapdb.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS ldapdb.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS ldapdb.o"
cat >>confdefs.h <<\_ACEOF
#Output of diff -Nru cyrus-sasl-2.1.21/configure.in{-old,}
--- cyrus-sasl-2.1.21/configure.in-old 2005-05-07 05:54:18.000000000 +0100
+++ cyrus-sasl-2.1.21/configure.in 2006-08-29 12:38:53.000000000 +0100
@@ -362,7 +362,7 @@
SASL_MECHS="$SASL_MECHS libcrammd5.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS cram.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/cram.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS cram.c"
AC_DEFINE(STATIC_CRAMMD5, [], [Link CRAM-MD5 Staticly])
fi
else
@@ -396,7 +396,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libdigestmd5.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/digestmd5.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS digestmd5.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS digestmd5.o"
AC_DEFINE(STATIC_DIGESTMD5, [], [Link DIGEST-MD5 Staticly])
fi
@@ -421,7 +421,7 @@
SASL_MECHS="$SASL_MECHS libotp.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/otp.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS otp.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS otp.o"
AC_DEFINE(STATIC_OTP, [], [Link OTP Staticly])
fi
@@ -478,7 +478,7 @@
SASL_MECHS="$SASL_MECHS libsrp.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/srp.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS srp.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS srp.o"
AC_DEFINE(STATIC_SRP, [], [Link SRP Staticly])
fi
@@ -535,7 +535,7 @@
SASL_MECHS="$SASL_MECHS libanonymous.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS anonymous.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/anonymous.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS anonymous.c"
AC_DEFINE(STATIC_ANONYMOUS, [], [Link ANONYMOUS Staticly])
fi
else
@@ -552,7 +552,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS liblogin.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/login.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS login.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS login.o"
AC_DEFINE(STATIC_LOGIN,[],[Link LOGIN Staticly])
fi
@@ -578,7 +578,7 @@
SASL_MECHS="$SASL_MECHS libntlm.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/ntlm.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS ntlm.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS ntlm.o"
AC_DEFINE(STATIC_NTLM,[],[Link NTLM Staticly])
fi
@@ -605,7 +605,7 @@
SASL_MECHS="$SASL_MECHS libpassdss.la"
if test "$enable_static" = yes; then
SASL_STATIC_OBJS="$SASL_STATIC_OBJS passdss.o"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/passdss.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS passdss.c"
AC_DEFINE(STATIC_PASSDSS,[],[Link PASSDSS Staticly])
fi
else
@@ -635,7 +635,7 @@
AC_MSG_RESULT(enabled)
SASL_MECHS="$SASL_MECHS libsql.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sql.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS sql.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
fi
@@ -875,7 +875,7 @@
SASL_MECHS="$SASL_MECHS libldapdb.la"
if test "$enable_static" = yes; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/ldapdb.c"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS ldapdb.c"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS ldapdb.o"
AC_DEFINE(STATIC_LDAPDB,[],[Link ldapdb plugin Staticly])
fi
#Output of diff -Nru cyrus-sasl-2.1.21/aclocal.m4{-old,}
--- cyrus-sasl-2.1.21/aclocal.m4-old 2005-05-15 06:58:02.000000000 +0100
+++ cyrus-sasl-2.1.21/aclocal.m4 2006-08-29 12:41:36.000000000 +0100
@@ -1418,7 +1418,7 @@
SASL_DB_BACKEND="db_${dblib}.lo"
SASL_DB_BACKEND_STATIC="db_${dblib}.o allockey.o"
-SASL_DB_BACKEND_STATIC_SRCS="../sasldb/db_${dblib}.c ../sasldb/allockey.c"
+SASL_DB_BACKEND_STATIC_SRCS="db_${dblib}.c allockey.c"
SASL_DB_UTILS="saslpasswd2 sasldblistusers2"
SASL_DB_MANS="saslpasswd2.8 sasldblistusers2.8"
@@ -1441,7 +1441,7 @@
dnl will just fail to load anyway.
SASL_DB_BACKEND="db_none.lo"
SASL_DB_BACKEND_STATIC="db_none.o"
- SASL_DB_BACKEND_STATIC_SRC="../sasldb/db_none.c"
+ SASL_DB_BACKEND_STATIC_SRCS="db_none.c"
SASL_DB_UTILS=""
SASL_DB_MANS=""
SASL_DB_LIB=""
@@ -1450,12 +1450,12 @@
if test "$enable_static" = yes; then
if test "$dblib" != "none"; then
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/sasldb.c $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS sasldb.c $SASL_DB_BACKEND_STATIC_SRCS"
SASL_STATIC_OBJS="$SASL_STATIC_OBJS sasldb.o $SASL_DB_BACKEND_STATIC"
AC_DEFINE(STATIC_SASLDB,[],[Link SASLdb Staticly])
else
SASL_STATIC_OBJS="$SASL_STATIC_OBJS $SASL_DB_BACKEND_STATIC"
- SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRC"
+ SASL_STATIC_SRCS="$SASL_STATIC_SRCS $SASL_DB_BACKEND_STATIC_SRCS"
fi
fi
