9:58 a.m.
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10460
Modified Files:
configure.ac Makefile.am aclocal.m4 configure missing
install-sh depcomp compile Makefile.in config.sub config.guess
Log Message:
fix build breakage on rhel4
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.ac 2 Aug 2007 14:44:09 -0000 1.16
+++ configure.ac 2 Aug 2007 14:58:34 -0000 1.17
@@ -230,6 +230,7 @@
# Check for library dependencies
m4_include(m4/nspr.m4)
m4_include(m4/nss.m4)
+m4_include(m4/sasl.m4)
m4_include(m4/mozldap.m4)
m4_include(m4/icu.m4)
m4_include(m4/adminutil.m4)
@@ -302,6 +303,9 @@
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
AC_SUBST(nss_libdir)
+AC_SUBST(sasl_inc)
+AC_SUBST(sasl_lib)
+AC_SUBST(sasl_libdir)
AC_SUBST(ldapsdk_inc)
AC_SUBST(ldapsdk_lib)
AC_SUBST(ldapsdk_libdir)
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- Makefile.am 2 Aug 2007 14:44:09 -0000 1.27
+++ Makefile.am 2 Aug 2007 14:58:34 -0000 1.28
@@ -127,8 +127,12 @@
LIBCRUN=@LIBCRUN@
DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil@adminutil_ver@
-ladminutil@adminutil_ver@ \
- @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60
-lldif60 \
- @nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET)
$(LIBCSTD) $(LIBCRUN)
+ @icu_lib@ -licui18n -licuuc -licudata \
+ @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
+ @sasl_lib@ -lsasl2 \
+ @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
+ @nspr_lib@ -lplds4 -lplc4 -lnspr4 \
+ $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
if CXXLINK_REQUIRED
MYLINK = $(CXXLINK)
@@ -367,7 +371,7 @@
else
# need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
# sort also strips out duplicates
-LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(adminutil_libdir)
$(icu_libdir) $(libdir)
+LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(sasl_libdir)
$(adminutil_libdir) $(icu_libdir) $(libdir)
LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST))
# now put it in the canonical form
LIBPATH = $(subst $(SPACE),$(COLON),$(LIBDIRS))
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure 2 Aug 2007 14:44:09 -0000 1.27
+++ configure 2 Aug 2007 14:58:34 -0000 1.28
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/fedora-ds
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir
nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib
ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib
icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir
propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser
httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir
brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs
MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir
nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir
ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir
adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir
cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir
mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir
nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE
APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE
MOD_RESTARTD_FALSE LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1067,6 +1067,9 @@
--with-nss=PATH Network Security Services (NSS) directory
--with-nss-inc=PATH Network Security Services (NSS) include directory
--with-nss-lib=PATH Network Security Services (NSS) library directory
+ --with-sasl=PATH Use sasl from supplied path
+ --with-sasl-inc=PATH SASL include file directory
+ --with-sasl-lib=PATH SASL library directory
--with-ldapsdk=PATH Mozilla LDAP SDK directory
--with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory
--with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory
@@ -4310,7 +4313,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4313 "configure"' > conftest.$ac_ext
+ echo '#line 4316 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5445,7 +5448,7 @@
# Provide some information about the compiler.
-echo "$as_me:5448:" \
+echo "$as_me:5451:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null
>&5\"") >&5
@@ -6508,11 +6511,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6511: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6514: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6515: \$? = $ac_status" >&5
+ echo "$as_me:6518: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6776,11 +6779,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6779: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6782: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6783: \$? = $ac_status" >&5
+ echo "$as_me:6786: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6880,11 +6883,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6883: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6886: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6887: \$? = $ac_status" >&5
+ echo "$as_me:6890: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8349,7 +8352,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8352 "configure"' > conftest.$ac_ext
+ echo '#line 8355 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9246,7 +9249,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9249 "configure"
+#line 9252 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9346,7 +9349,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9349 "configure"
+#line 9352 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11689,11 +11692,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11692: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11695: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11696: \$? = $ac_status" >&5
+ echo "$as_me:11699: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11793,11 +11796,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11796: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11799: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11800: \$? = $ac_status" >&5
+ echo "$as_me:11803: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12329,7 +12332,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12332 "configure"' > conftest.$ac_ext
+ echo '#line 12335 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13387,11 +13390,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13390: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13393: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13394: \$? = $ac_status" >&5
+ echo "$as_me:13397: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13491,11 +13494,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13494: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13497: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13498: \$? = $ac_status" >&5
+ echo "$as_me:13501: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14940,7 +14943,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14943 "configure"' > conftest.$ac_ext
+ echo '#line 14946 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15718,11 +15721,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15721: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15724: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15725: \$? = $ac_status" >&5
+ echo "$as_me:15728: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15986,11 +15989,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15989: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15992: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15993: \$? = $ac_status" >&5
+ echo "$as_me:15996: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16090,11 +16093,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16093: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16097: \$? = $ac_status" >&5
+ echo "$as_me:16100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17559,7 +17562,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17562 "configure"' > conftest.$ac_ext
+ echo '#line 17565 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -24202,6 +24205,148 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
+# -*- tab-width: 4; -*-
+# Configure paths for SASL
+
+{ echo "$as_me:$LINENO: checking for sasl..." >&5
+echo "$as_me: checking for sasl..." >&6;}
+
+echo "$as_me:$LINENO: checking for --with-sasl" >&5
+echo $ECHO_N "checking for --with-sasl... $ECHO_C" >&6
+
+# Check whether --with-sasl or --without-sasl was given.
+if test "${with_sasl+set}" = set; then
+ withval="$with_sasl"
+
+ if test "$withval" = "yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+ if test -f /usr/include/sasl/sasl.h; then
+ sasl_inc="-I/usr/include/sasl"
+ elif test -f /usr/include/sasl.h; then
+ sasl_inc="-I/usr/include"
+ else
+ { { echo "$as_me:$LINENO: error: sasl.h not found" >&5
+echo "$as_me: error: sasl.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ elif test -d "$withval" -a -d "$withval/lib" -a -d
"$withval/include" ; then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+
+ if test -f "$withval/include/sasl/sasl.h"; then
+ sasl_inc="-I$withval/include/sasl"
+ elif test -f "$withval/include/sasl.h"; then
+ sasl_inc="-I$withval/include"
+ else
+ { { echo "$as_me:$LINENO: error: sasl.h not found" >&5
+echo "$as_me: error: sasl.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ sasl_lib="-L$withval/lib"
+ sasl_libdir="$withval/lib"
+ else
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ { { echo "$as_me:$LINENO: error: sasl not found in $withval"
>&5
+echo "$as_me: error: sasl not found in $withval" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+echo "$as_me:$LINENO: checking for --with-sasl-inc" >&5
+echo $ECHO_N "checking for --with-sasl-inc... $ECHO_C" >&6
+
+# Check whether --with-sasl-inc or --without-sasl-inc was given.
+if test "${with_sasl_inc+set}" = set; then
+ withval="$with_sasl_inc"
+
+ if test -f "$withval"/sasl.h; then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ sasl_inc="-I$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval/sasl.h not found" >&5
+echo "$as_me: error: $withval/sasl.h not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+echo "$as_me:$LINENO: checking for --with-sasl-lib" >&5
+echo $ECHO_N "checking for --with-sasl-lib... $ECHO_C" >&6
+
+# Check whether --with-sasl-lib or --without-sasl-lib was given.
+if test "${with_sasl_lib+set}" = set; then
+ withval="$with_sasl_lib"
+
+ if test -d "$withval"; then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ sasl_lib="-L$withval"
+ sasl_libdir="$withval"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval not found" >&5
+echo "$as_me: error: $withval not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+if test -z "$sasl_inc"; then
+ echo "$as_me:$LINENO: checking for sasl.h" >&5
+echo $ECHO_N "checking for sasl.h... $ECHO_C" >&6
+ if test -f /usr/include/sasl/sasl.h; then
+ echo "$as_me:$LINENO: result: using /usr/include/sasl/sasl.h" >&5
+echo "${ECHO_T}using /usr/include/sasl/sasl.h" >&6
+ sasl_inc="-I/usr/include/sasl"
+ elif test -f /usr/include/sasl.h; then
+ echo "$as_me:$LINENO: result: using /usr/include/sasl.h" >&5
+echo "${ECHO_T}using /usr/include/sasl.h" >&6
+ sasl_inc="-I/usr/include"
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ { { echo "$as_me:$LINENO: error: sasl not found, specify with --with-sasl."
>&5
+echo "$as_me: error: sasl not found, specify with --with-sasl." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2007 Red Hat, Inc.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# END COPYRIGHT BLOCK
{ echo "$as_me:$LINENO: checking for LDAPSDK..." >&5
echo "$as_me: checking for LDAPSDK..." >&6;}
@@ -24984,6 +25129,9 @@
+
+
+
# write out paths for data/config files
@@ -25911,6 +26059,9 @@
s,@nss_inc@,$nss_inc,;t t
s,@nss_lib@,$nss_lib,;t t
s,@nss_libdir@,$nss_libdir,;t t
+s,@sasl_inc@,$sasl_inc,;t t
+s,@sasl_lib@,$sasl_lib,;t t
+s,@sasl_libdir@,$sasl_libdir,;t t
s,@ldapsdk_inc@,$ldapsdk_inc,;t t
s,@ldapsdk_lib@,$ldapsdk_lib,;t t
s,@ldapsdk_libdir@,$ldapsdk_libdir,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Makefile.in 2 Aug 2007 14:44:09 -0000 1.30
+++ Makefile.in 2 Aug 2007 14:58:34 -0000 1.31
@@ -64,9 +64,9 @@
am__aclocal_m4_deps = $(top_srcdir)/m4/fhs.m4 \
$(top_srcdir)/m4/fortitude.m4 $(top_srcdir)/m4/httpd.m4 \
$(top_srcdir)/m4/nspr.m4 $(top_srcdir)/m4/nss.m4 \
- $(top_srcdir)/m4/mozldap.m4 $(top_srcdir)/m4/icu.m4 \
- $(top_srcdir)/m4/adminutil.m4 $(top_srcdir)/m4/mod_nss.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/sasl.m4 $(top_srcdir)/m4/mozldap.m4 \
+ $(top_srcdir)/m4/icu.m4 $(top_srcdir)/m4/adminutil.m4 \
+ $(top_srcdir)/m4/mod_nss.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -495,6 +495,9 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
propertydir = $(datadir)@propertydir@
+sasl_inc = @sasl_inc@
+sasl_lib = @sasl_lib@
+sasl_libdir = @sasl_libdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
@@ -571,8 +574,12 @@
lib_LTLIBRARIES = libds-admin-serv.la
noinst_LIBRARIES = libdsa.a
DEFAULT_LIBS = libds-admin-serv.la @adminutil_lib@ -ladmsslutil@adminutil_ver@
-ladminutil@adminutil_ver@ \
- @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60
-lldif60 \
- @nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBNSL) $(LIBSOCKET)
$(LIBCSTD) $(LIBCRUN)
+ @icu_lib@ -licui18n -licuuc -licudata \
+ @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60 \
+ @sasl_lib@ -lsasl2 \
+ @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3 \
+ @nspr_lib@ -lplds4 -lplc4 -lnspr4 \
+ $(LIBNSL) $(LIBSOCKET) $(LIBCSTD) $(LIBCRUN)
@CXXLINK_REQUIRED_FALSE@MYLINK = $(LINK)
@CXXLINK_REQUIRED_TRUE@MYLINK = $(CXXLINK)
@@ -785,7 +792,7 @@
@BUNDLE_TRUE@perlpath = $(perldir) $(libdir)/perl/arch $(libdir)/perl
# need to create the LD_LIBRARY_PATH,SHLIB_PATH string to use in scripts
# sort also strips out duplicates
-@BUNDLE_FALSE@LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir)
$(adminutil_libdir) $(icu_libdir) $(libdir)
+@BUNDLE_FALSE@LIBDIRLIST = $(nspr_libdir) $(nss_libdir) $(ldapsdk_libdir) $(sasl_libdir)
$(adminutil_libdir) $(icu_libdir) $(libdir)
@BUNDLE_FALSE@LIBDIRS = $(call mysort,-ru,$(LIBDIRLIST))
# The root resource bundle is based on English (en) locale;