[Fedora-directory-commits] mod_admserv sasl.m4, NONE, 1.1 nspr.m4, NONE, 1.1 nss.m4, NONE, 1.1 icu.m4, NONE, 1.1 adminutil.m4, NONE, 1.1 mozldap.m4, NONE, 1.1 configure.in, 1.22, 1.23 Makefile.am, 1.18, 1.19 aclocal.m4, 1.17, 1.18 configure, 1.27, 1.28 mkinstalldirs, 1.8, 1.9 missing, 1.8, 1.9 Makefile.in, 1.25, 1.26 install-sh, 1.8, 1.9 depcomp, 1.8, 1.9 config.sub, 1.8, 1.9 config.guess, 1.8, 1.9 compile, 1.1, 1.2
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Aug 17 18:41:19 UTC 2007
- Previous message (by thread): [Fedora-directory-commits] adminserver configure.ac, 1.18, 1.19 aclocal.m4, 1.29, 1.30 configure, 1.32, 1.33 missing, 1.20, 1.21 install-sh, 1.20, 1.21 depcomp, 1.20, 1.21 config.sub, 1.20, 1.21 config.guess, 1.20, 1.21 compile, 1.19, 1.20 Makefile.in, 1.35, 1.36
- Next message (by thread): [Fedora-directory-commits] console buildnum.pl,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24067
Modified Files:
configure.in Makefile.am aclocal.m4 configure mkinstalldirs
missing Makefile.in install-sh depcomp config.sub config.guess
compile
Added Files:
sasl.m4 nspr.m4 nss.m4 icu.m4 adminutil.m4 mozldap.m4
Log Message:
add sasl - also just use the m4 files from adminserver instead of hard coding all of the component stuff in configure.in
--- NEW FILE sasl.m4 ---
# 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
# -*- tab-width: 4; -*-
# Configure paths for SASL
dnl ========================================================
dnl = sasl is used to support various authentication mechanisms
dnl = such as DIGEST-MD5 and GSSAPI.
dnl ========================================================
dnl ========================================================
dnl = Use the sasl libraries on the system (assuming it exists)
dnl ========================================================
AC_CHECKING(for sasl)
AC_MSG_CHECKING(for --with-sasl)
AC_ARG_WITH(sasl,
[[ --with-sasl=PATH Use sasl from supplied path]],
dnl = Look in the standard system locations
[
if test "$withval" = "yes"; then
AC_MSG_RESULT(yes)
dnl = Check for sasl.h in the normal locations
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
AC_MSG_ERROR(sasl.h not found)
fi
dnl = Check the user provided location
elif test -d "$withval" -a -d "$withval/lib" -a -d "$withval/include" ; then
AC_MSG_RESULT([using $withval])
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
AC_MSG_ERROR(sasl.h not found)
fi
sasl_lib="-L$withval/lib"
sasl_libdir="$withval/lib"
else
AC_MSG_RESULT(yes)
AC_MSG_ERROR([sasl not found in $withval])
fi
],
AC_MSG_RESULT(no))
AC_MSG_CHECKING(for --with-sasl-inc)
AC_ARG_WITH(sasl-inc,
[[ --with-sasl-inc=PATH SASL include file directory]],
[
if test -f "$withval"/sasl.h; then
AC_MSG_RESULT([using $withval])
sasl_inc="-I$withval"
else
echo
AC_MSG_ERROR([$withval/sasl.h not found])
fi
],
AC_MSG_RESULT(no))
AC_MSG_CHECKING(for --with-sasl-lib)
AC_ARG_WITH(sasl-lib,
[[ --with-sasl-lib=PATH SASL library directory]],
[
if test -d "$withval"; then
AC_MSG_RESULT([using $withval])
sasl_lib="-L$withval"
sasl_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
if test -z "$sasl_inc"; then
AC_MSG_CHECKING(for sasl.h)
dnl - Check for sasl in standard system locations
if test -f /usr/include/sasl/sasl.h; then
AC_MSG_RESULT([using /usr/include/sasl/sasl.h])
sasl_inc="-I/usr/include/sasl"
elif test -f /usr/include/sasl.h; then
AC_MSG_RESULT([using /usr/include/sasl.h])
sasl_inc="-I/usr/include"
else
AC_MSG_RESULT(no)
AC_MSG_ERROR([sasl not found, specify with --with-sasl.])
fi
fi
--- NEW FILE nspr.m4 ---
# 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
AC_CHECKING(for NSPR)
# check for --with-nspr
AC_MSG_CHECKING(for --with-nspr)
AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory],
[
if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
NSPRDIR=$withval
nspr_inc="-I$NSPRDIR/include"
nspr_lib="-L$NSPRDIR/lib"
nspr_libdir="$NSPRDIR/lib"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-nspr-inc
AC_MSG_CHECKING(for --with-nspr-inc)
AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory],
[
if test -e "$withval"/nspr.h
then
AC_MSG_RESULT([using $withval])
nspr_inc="-I$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-nspr-lib
AC_MSG_CHECKING(for --with-nspr-lib)
AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory],
[
if test -d "$withval"
then
AC_MSG_RESULT([using $withval])
nspr_lib="-L$withval"
nspr_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# if NSPR is not found yet, try pkg-config
# last resort
if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config)
AC_MSG_CHECKING(for nspr with pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists nspr; then
nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ .*$//`
AC_MSG_RESULT([using system NSPR])
elif $PKG_CONFIG --exists dirsec-nspr; then
nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr`
nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr`
nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ .*$//`
AC_MSG_RESULT([using system dirsec NSPR])
else
AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
fi
fi
fi
--- NEW FILE nss.m4 ---
# 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
AC_CHECKING(for NSS)
# check for --with-nss
AC_MSG_CHECKING(for --with-nss)
AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory],
[
if test -e "$withval"/include/nss.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
NSSDIR=$withval
nss_inc="-I$NSSDIR/include"
nss_lib="-L$NSSDIR/lib"
nss_libdir="$NSSDIR/lib"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-nss-inc
AC_MSG_CHECKING(for --with-nss-inc)
AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory],
[
if test -e "$withval"/nss.h
then
AC_MSG_RESULT([using $withval])
nss_inc="-I$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-nss-lib
AC_MSG_CHECKING(for --with-nss-lib)
AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory],
[
if test -d "$withval"
then
AC_MSG_RESULT([using $withval])
nss_lib="-L$withval"
nss_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# if NSS is not found yet, try pkg-config
# last resort
if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config)
AC_MSG_CHECKING(for nss with pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
nss_libdir=`$PKG_CONFIG --variable=libdir nss`
AC_MSG_RESULT([using system NSS])
elif $PKG_CONFIG --exists dirsec-nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
nss_libdir=`$PKG_CONFIG --variable=libdir dirsec-nss`
AC_MSG_RESULT([using system dirsec NSS])
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi
fi
fi
--- NEW FILE icu.m4 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 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
AC_CHECKING(for LIBICU)
# check for --with-icu
AC_MSG_CHECKING(for --with-icu)
AC_ARG_WITH(icu, [ --with-icu=PATH ICU directory],
[
if test -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
ICUDIR="$withval"
icu_lib="-L$ICUDIR/lib"
icu_libdir="$ICUDIR/lib"
else
echo
AC_MSG_ERROR([$withval not found])
fi
icu_inc="-I$withval/include"
icu_bin="$withval/bin"
],
AC_MSG_RESULT(no))
# check for --with-icu-inc
AC_MSG_CHECKING(for --with-icu-inc)
AC_ARG_WITH(icu-inc, [ --with-icu-inc=PATH ICU include directory],
[
if test -d "$withval"
then
AC_MSG_RESULT([using $withval])
icu_inc="-I$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-icu-lib
AC_MSG_CHECKING(for --with-icu-lib)
AC_ARG_WITH(icu-lib, [ --with-icu-lib=PATH ICU library directory],
[
if test -d "$withval"
then
AC_MSG_RESULT([using $withval])
icu_lib="-L$withval"
icu_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-icu-bin
AC_MSG_CHECKING(for --with-icu-bin)
AC_ARG_WITH(icu-bin, [ --with-icu-bin=PATH ICU binary directory],
[
if test -d "$withval"
then
AC_MSG_RESULT([using $withval])
icu_bin="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# if ICU is not found yet, try pkg-config
# last resort
if test -z "$icu_lib"; then
AC_MSG_CHECKING(for icu with icu-config)
AC_PATH_PROG(ICU_CONFIG, icu-config)
if test -n "$ICU_CONFIG"; then
icu_lib=`$ICU_CONFIG --ldflags-searchpath`
icu_libdir=`$ICU_CONFIG --libdir`
icu_inc=`$ICU_CONFIG --cppflags-searchpath`
icu_bin=`$ICU_CONFIG --bindir`
AC_MSG_RESULT([using system ICU])
else
AC_MSG_ERROR([ICU not found, specify with --with-icu.])
fi
fi
--- NEW FILE adminutil.m4 ---
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 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
AC_CHECKING(for ADMINUTIL)
# check for --with-adminutil
AC_MSG_CHECKING(for --with-adminutil)
AC_ARG_WITH(adminutil, [ --with-adminutil=PATH Adminutil directory],
[
if test -d "$withval"/include -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
ADMINUTILDIR=$withval
adminutil_lib="-L$ADMINUTILDIR/lib"
adminutil_libdir="$ADMINUTILDIR/lib"
adminutil_incdir=$ADMINUTILDIR/include
if ! test -e "$adminutil_incdir/libadminutil/admutil.h" ; then
AC_MSG_ERROR([$withval include dir not found])
fi
adminutil_inc="-I$adminutil_incdir"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# if ADMINUTIL is not found yet, try pkg-config
# last resort
if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
AC_MSG_CHECKING(for adminutil with pkg-config)
AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists adminutil; then
adminutil_inc=`$PKG_CONFIG --cflags-only-I adminutil`
adminutil_lib=`$PKG_CONFIG --libs-only-L adminutil`
adminutil_libdir=`$PKG_CONFIG --libs-only-L adminutil | sed -e s/-L// | sed -e s/\ .*$//`
else
AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.])
fi
fi
fi
if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.])
fi
--- NEW FILE mozldap.m4 ---
# 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
AC_CHECKING(for LDAPSDK)
# check for --with-ldapsdk
AC_MSG_CHECKING(for --with-ldapsdk)
AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory],
[
if test -e "$withval"/include/ldap.h -a -d "$withval"/lib
then
AC_MSG_RESULT([using $withval])
LDAPSDKDIR=$withval
ldapsdk_inc="-I$LDAPSDKDIR/include"
ldapsdk_lib="-L$LDAPSDKDIR/lib"
ldapsdk_libdir="$LDAPSDKDIR/lib"
ldapsdk_bindir="$LDAPSDKDIR/bin"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-ldapsdk-inc
AC_MSG_CHECKING(for --with-ldapsdk-inc)
AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory],
[
if test -e "$withval"/ldap.h
then
AC_MSG_RESULT([using $withval])
ldapsdk_inc="-I$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# check for --with-ldapsdk-lib
AC_MSG_CHECKING(for --with-ldapsdk-lib)
AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory],
[
if test -d "$withval"
then
AC_MSG_RESULT([using $withval])
ldapsdk_lib="-L$withval"
ldapsdk_libdir="$withval"
else
echo
AC_MSG_ERROR([$withval not found])
fi
],
AC_MSG_RESULT(no))
# if LDAPSDK is not found yet, try pkg-config
# last resort
if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config)
AC_MSG_CHECKING(for mozldap with pkg-config)
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists mozldap6; then
mozldappkg=mozldap6
elif $PKG_CONFIG --exists mozldap; then
mozldappkg=mozldap
else
AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
fi
ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg`
ldapsdk_lib="-L$ldapsdk_libdir"
ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg`
AC_MSG_RESULT([using system $mozldappkg])
fi
fi
if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
fi
dnl default path for the ldap c sdk tools (see [210947] for more details)
if test -z "$ldapsdk_bindir" ; then
if [ -d $libdir/mozldap6 ] ; then
ldapsdk_bindir=$libdir/mozldap6
else
ldapsdk_bindir=$libdir/mozldap
fi
fi
dnl make sure the ldap sdk version is 6 or greater - we do not support
dnl the old 5.x or prior versions - the ldap server code expects the new
dnl ber types and other code used with version 6
save_cppflags="$CPPFLAGS"
CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc"
AC_CHECK_HEADER([ldap.h], [isversion6=1], [isversion6=],
[#include <ldap-standard.h>
#if LDAP_VENDOR_VERSION < 600
#error The LDAP C SDK version is not supported
#endif
])
CPPFLAGS="$save_cppflags"
if test -z "$isversion6" ; then
AC_MSG_ERROR([The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported])
fi
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure.in 21 Jun 2007 21:32:56 -0000 1.22
+++ configure.in 17 Aug 2007 18:41:16 -0000 1.23
@@ -122,327 +122,13 @@
fi
fi
-AC_CHECKING(for NSPR)
-
-# check for --with-nspr
-AC_MSG_CHECKING(for --with-nspr)
-AC_ARG_WITH(nspr, [ --with-nspr=PATH Netscape Portable Runtime (NSPR) directory],
-[
- if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
- then
- AC_MSG_RESULT([using $withval])
- NSPRDIR=$withval
- nspr_inc="-I$NSPRDIR/include"
- nspr_lib="-L$NSPRDIR/lib"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-nspr-inc
-AC_MSG_CHECKING(for --with-nspr-inc)
-AC_ARG_WITH(nspr-inc, [ --with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory],
-[
- if test -e "$withval"/nspr.h
- then
- AC_MSG_RESULT([using $withval])
- nspr_inc="-I$withval"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-nspr-lib
-AC_MSG_CHECKING(for --with-nspr-lib)
-AC_ARG_WITH(nspr-lib, [ --with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory],
-[
- if test -d "$withval"
- then
- AC_MSG_RESULT([using $withval])
- nspr_lib="-L$withval"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# if NSPR is not found yet, try pkg-config
-
-# last resort
-if test -z "$nspr_inc" -o -z "$nspr_lib"; then
- AC_MSG_CHECKING(for nspr with pkg-config)
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists nspr; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
- nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
- AC_MSG_RESULT([using system NSPR])
- elif $PKG_CONFIG --exists dirsec-nspr; then
- nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr`
- nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr`
- AC_MSG_RESULT([using system dirsec NSPR])
- else
- AC_MSG_ERROR([NSPR not found, specify with --with-nspr.])
- fi
- fi
-fi
-
-AC_CHECKING(for LDAPSDK)
-
-# check for --with-ldapsdk
-AC_MSG_CHECKING(for --with-ldapsdk)
-AC_ARG_WITH(ldapsdk, [ --with-ldapsdk=PATH Mozilla LDAP SDK directory],
-[
- if test -e "$withval"/include/ldap.h -a -d "$withval"/lib
- then
- AC_MSG_RESULT([using $withval])
- LDAPSDKDIR="$withval"
- LDAPSDKLIBDIR="$withval/lib"
- ldapsdk_inc="-I$LDAPSDKDIR/include"
- ldapsdk_lib="-L$LDAPSDKDIR/lib"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-ldapsdk-inc
-AC_MSG_CHECKING(for --with-ldapsdk-inc)
-AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory],
-[
- if test -e "$withval"/ldap.h
- then
- AC_MSG_RESULT([using $withval])
- ldapsdk_inc="-I$withval"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-ldapsdk-lib
-AC_MSG_CHECKING(for --with-ldapsdk-lib)
-AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory],
-[
- if test -d "$withval"
- then
- AC_MSG_RESULT([using $withval])
- LDAPSDKLIBDIR="$withval"
- ldapsdk_lib="-L$withval"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# if LDAPSDK is not found yet, try pkg-config
-
-# last resort
-if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
- AC_MSG_CHECKING(for mozldap with pkg-config)
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozldap6; then
- ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6`
- ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6`
- ldapsdk_ver=60
- elif $PKG_CONFIG --exists mozldap; then
- ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap`
- ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap`
- ldapsdk_ver=60
- else
- AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
- fi
- fi
-fi
-if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
- AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
-fi
-
-if test -z "$ldapsdk_ver" ; then
- # figure out version of ldapsdk - if we find a 60 version, break, use it
- # otherwise, keep looking
- for file in $LDAPSDKLIBDIR/libldap??.so* ; do
- case $file in
- *libldap60.so*) ldapsdk_ver=60 ; break ;;
- *) ldapsdk_ver=50 ;;
- esac
- done
-fi
-
-AC_CHECKING(for ADMINUTIL)
-
-# check for --with-adminutil
-AC_MSG_CHECKING(for --with-adminutil)
-AC_ARG_WITH(adminutil, [ --with-adminutil=PATH Adminutil directory],
-[
- if test -d "$withval"/include -a -d "$withval"/lib
- then
- AC_MSG_RESULT([using $withval])
- ADMINUTILDIR=$withval
- adminutil_lib="-L$ADMINUTILDIR/lib"
- # check for version - only needed for older adminutil versions
- for file in $ADMINUTILDIR/lib/* ; do
- echo $file | grep 'libadminutil[[0-9][0-9]]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([[0-9][0-9]]\).*/\1/'` ; break
- done
- # use the latest one
- adminutil_incdir=`ls -1d $ADMINUTILDIR/include/adminutil-* | sort -n | tail -1`
- if ! test -n "$adminutil_incdir" -a -d "$adminutil_incdir" ; then
- adminutil_incdir=$ADMINUTILDIR/include
- fi
- if ! test -e "$adminutil_incdir/libadminutil/admutil.h" ; then
- AC_MSG_ERROR([$withval include dir not found])
- fi
- adminutil_inc="-I$adminutil_incdir"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# if ADMINUTIL is not found yet, try pkg-config
-
-# last resort
-if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
- AC_MSG_CHECKING(for adminutil with pkg-config)
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists adminutil; then
- adminutil_inc=`$PKG_CONFIG --cflags-only-I adminutil`
- adminutil_lib=`$PKG_CONFIG --libs-only-L adminutil`
- else
- AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.])
- fi
- fi
-fi
-
-if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
- AC_MSG_ERROR([ADMINUTIL not found, specify with --with-adminutil.])
-fi
-
-###################################3
-AC_CHECKING(for LIBICU)
-
-# check for --with-icu
-AC_MSG_CHECKING(for --with-icu)
-AC_ARG_WITH(icu, [ --with-icu=PATH Icu directory],
-[
- if test -d "$withval"/lib
- then
- AC_MSG_RESULT([using $withval])
- ICUDIR=$withval
- icu_lib="-L$ICUDIR/lib"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# if ICU is not found yet, try pkg-config
-
-# last resort
-if test -z "$icu_lib"; then
- AC_MSG_CHECKING(for icu with pkg-config)
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- AC_PATH_PROG(ICU_CONFIG, icu-config)
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists icu; then
- icu_lib=`$PKG_CONFIG --libs-only-L icu`
- fi
- fi
- if test -z "$icu_lib" ; then
- if test -n "$ICU_CONFIG" ; then
- icu_lib=`$ICU_CONFIG --ldflags-searchpath`
- fi
- fi
- if test -z "$icu_lib" ; then
- AC_MSG_ERROR([ICU not found, specify with --with-icu.])
- fi
-fi
-
-if test -z "$icu_lib"; then
- AC_MSG_ERROR([ICU not found, specify with --with-icu.])
-fi
-###################################3
-AC_CHECKING(for NSS)
-
-# check for --with-nss
-AC_MSG_CHECKING(for --with-nss)
-AC_ARG_WITH(nss, [ --with-nss=PATH Network Security Services (NSS) directory],
-[
- if test -e "$withval"/include/nss.h -a -d "$withval"/lib
- then
- AC_MSG_RESULT([using $withval])
- NSSDIR=$withval
- nss_inc="-I$NSSDIR/include"
- nss_lib="-L$NSSDIR/lib"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-nss-inc
-AC_MSG_CHECKING(for --with-nss-inc)
-AC_ARG_WITH(nss-inc, [ --with-nss-inc=PATH Network Security Services (NSS) include directory],
-[
- if test -e "$withval"/nss.h
- then
- AC_MSG_RESULT([using $withval])
- nss_inc="-I$withval"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# check for --with-nss-lib
-AC_MSG_CHECKING(for --with-nss-lib)
-AC_ARG_WITH(nss-lib, [ --with-nss-lib=PATH Network Security Services (NSS) library directory],
-[
- if test -d "$withval"
- then
- AC_MSG_RESULT([using $withval])
- nss_lib="-L$withval"
- else
- echo
- AC_MSG_ERROR([$withval not found])
- fi
-],
-AC_MSG_RESULT(no))
-
-# if NSS is not found yet, try pkg-config
-
-# last resort
-if test -z "$nss_inc" -o -z "$nss_lib"; then
- AC_MSG_CHECKING(for nss with pkg-config)
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I nss`
- nss_lib=`$PKG_CONFIG --libs-only-L nss`
- AC_MSG_RESULT([using system NSS])
- elif $PKG_CONFIG --exists dirsec-nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
- nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
- AC_MSG_RESULT([using system dirsec NSS])
- else
- AC_MSG_ERROR([NSS not found, specify with --with-nss.])
- fi
- fi
-fi
+# Check for library dependencies
+m4_include(nspr.m4)
+m4_include(nss.m4)
+m4_include(sasl.m4)
+m4_include(mozldap.m4)
+m4_include(icu.m4)
+m4_include(adminutil.m4)
# building with adminserver or standalone?
AC_ARG_WITH(adminserver, [ --with-adminserver Building as part of the Admin Server],
@@ -452,6 +138,7 @@
AM_CONDITIONAL([HAVE_ADMINSERVER], $HAVE_ADMINSERVER)
# Substitute values
+# write out paths for binary components
AC_SUBST(APXS)
AC_SUBST(apr_inc)
AC_SUBST(apache_inc)
@@ -469,6 +156,7 @@
AC_SUBST(icu_lib)
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
+AC_SUBST(sasl_lib)
AC_SUBST(extra_cppflags)
AC_SUBST(moddir)
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am 21 Jun 2007 23:17:48 -0000 1.18
+++ Makefile.am 17 Aug 2007 18:41:16 -0000 1.19
@@ -20,7 +20,7 @@
mod_admserv_la_SOURCES = mod_admserv.c
mod_admserv_la_CPPFLAGS = $(AM_CPPFLAGS) -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ @extra_cppflags@
mod_admserv_la_LDFLAGS = -module -avoid-version
-mod_admserv_la_LIBADD = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap at ldapsdk_ver@ -lprldap at ldapsdk_ver@ -lldap at ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBCSTD) $(LIBCRUN)
+mod_admserv_la_LIBADD = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 @sasl_lib@ -lsasl2 $(LIBCSTD) $(LIBCRUN)
if CXXLINK_REQUIRED
mod_admserv_la_LINK = $(CXXLINK) $(mod_admserv_la_LDFLAGS)
else
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure 21 Jun 2007 23:17:48 -0000 1.27
+++ configure 17 Aug 2007 18:41:16 -0000 1.28
@@ -462,7 +462,7 @@
# include <unistd.h>
#endif"
-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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCSTD LIB!
CRUN platform_defs CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE APR_CONFIG APXS PKG_CONFIG ICU_CONFIG HAVE_ADMINSERVER_TRUE HAVE_ADMINSERVER_FALSE apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib ldapsdk_ver adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib extra_cppflags moddir LIBOBJS 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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBCSTD LIB!
CRUN platform_defs CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE APR_CONFIG APXS PKG_CONFIG ICU_CONFIG HAVE_ADMINSERVER_TRUE HAVE_ADMINSERVER_FALSE apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc nspr_lib ldapsdk_inc ldapsdk_lib ldapsdk_ver adminutil_inc adminutil_lib adminutil_ver icu_lib nss_inc nss_lib sasl_lib extra_cppflags moddir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1047,14 +1047,20 @@
--with-nspr=PATH Netscape Portable Runtime (NSPR) directory
--with-nspr-inc=PATH Netscape Portable Runtime (NSPR) include file directory
--with-nspr-lib=PATH Netscape Portable Runtime (NSPR) library directory
+ --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
+ --with-icu=PATH ICU directory
+ --with-icu-inc=PATH ICU include directory
+ --with-icu-lib=PATH ICU library directory
+ --with-icu-bin=PATH ICU binary directory
--with-adminutil=PATH Adminutil directory
- --with-icu=PATH Icu directory
- --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-adminserver Building as part of the Admin Server
--with-moddir Directory for Apache modules
@@ -3687,7 +3693,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3690 "configure"' > conftest.$ac_ext
+ echo '#line 3696 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5286,7 +5292,7 @@
# Provide some information about the compiler.
-echo "$as_me:5289:" \
+echo "$as_me:5295:" \
"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
@@ -6349,11 +6355,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:6352: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6358: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6356: \$? = $ac_status" >&5
+ echo "$as_me:6362: \$? = $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.
@@ -6617,11 +6623,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:6620: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6626: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6624: \$? = $ac_status" >&5
+ echo "$as_me:6630: \$? = $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.
@@ -6721,11 +6727,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:6724: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6730: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6728: \$? = $ac_status" >&5
+ echo "$as_me:6734: \$? = $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
@@ -8190,7 +8196,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8193 "configure"' > conftest.$ac_ext
+ echo '#line 8199 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9087,7 +9093,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9090 "configure"
+#line 9096 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9187,7 +9193,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9190 "configure"
+#line 9196 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11530,11 +11536,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:11533: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11539: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11537: \$? = $ac_status" >&5
+ echo "$as_me:11543: \$? = $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.
@@ -11634,11 +11640,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:11637: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11643: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11641: \$? = $ac_status" >&5
+ echo "$as_me:11647: \$? = $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
@@ -12170,7 +12176,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12173 "configure"' > conftest.$ac_ext
+ echo '#line 12179 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13228,11 +13234,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:13231: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13237: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13235: \$? = $ac_status" >&5
+ echo "$as_me:13241: \$? = $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.
@@ -13332,11 +13338,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:13335: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13339: \$? = $ac_status" >&5
+ echo "$as_me:13345: \$? = $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
@@ -14781,7 +14787,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14784 "configure"' > conftest.$ac_ext
+ echo '#line 14790 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15559,11 +15565,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:15562: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15568: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15566: \$? = $ac_status" >&5
+ echo "$as_me:15572: \$? = $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.
@@ -15827,11 +15833,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:15830: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15836: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15834: \$? = $ac_status" >&5
+ echo "$as_me:15840: \$? = $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.
@@ -15931,11 +15937,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:15934: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15940: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15938: \$? = $ac_status" >&5
+ echo "$as_me:15944: \$? = $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
@@ -17400,7 +17406,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17403 "configure"' > conftest.$ac_ext
+ echo '#line 17409 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19286,6 +19292,27 @@
fi
fi
+# Check for library dependencies
+# 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 NSPR..." >&5
echo "$as_me: checking for NSPR..." >&6;}
@@ -19304,6 +19331,7 @@
NSPRDIR=$withval
nspr_inc="-I$NSPRDIR/include"
nspr_lib="-L$NSPRDIR/lib"
+ nspr_libdir="$NSPRDIR/lib"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19354,6 +19382,7 @@
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
nspr_lib="-L$withval"
+ nspr_libdir="$withval"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19369,9 +19398,7 @@
# if NSPR is not found yet, try pkg-config
# last resort
-if test -z "$nspr_inc" -o -z "$nspr_lib"; then
- echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5
-echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6
+if test -z "$nspr_inc" -o -z "$nspr_lib" -o -z "$nspr_libdir"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19411,15 +19438,19 @@
echo "${ECHO_T}no" >&6
fi
+ echo "$as_me:$LINENO: checking for nspr with pkg-config" >&5
+echo $ECHO_N "checking for nspr with pkg-config... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
if $PKG_CONFIG --exists nspr; then
nspr_inc=`$PKG_CONFIG --cflags-only-I nspr`
nspr_lib=`$PKG_CONFIG --libs-only-L nspr`
+ nspr_libdir=`$PKG_CONFIG --libs-only-L nspr | sed -e s/-L// | sed -e s/\ .*$//`
echo "$as_me:$LINENO: result: using system NSPR" >&5
echo "${ECHO_T}using system NSPR" >&6
elif $PKG_CONFIG --exists dirsec-nspr; then
nspr_inc=`$PKG_CONFIG --cflags-only-I dirsec-nspr`
nspr_lib=`$PKG_CONFIG --libs-only-L dirsec-nspr`
+ nspr_libdir=`$PKG_CONFIG --libs-only-L dirsec-nspr | sed -e s/-L// | sed -e s/\ .*$//`
echo "$as_me:$LINENO: result: using system dirsec NSPR" >&5
echo "${ECHO_T}using system dirsec NSPR" >&6
else
@@ -19430,25 +19461,45 @@
fi
fi
-{ echo "$as_me:$LINENO: checking for LDAPSDK..." >&5
-echo "$as_me: checking for LDAPSDK..." >&6;}
+# 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
-# check for --with-ldapsdk
-echo "$as_me:$LINENO: checking for --with-ldapsdk" >&5
-echo $ECHO_N "checking for --with-ldapsdk... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for NSS..." >&5
+echo "$as_me: checking for NSS..." >&6;}
-# Check whether --with-ldapsdk or --without-ldapsdk was given.
-if test "${with_ldapsdk+set}" = set; then
- withval="$with_ldapsdk"
+# check for --with-nss
+echo "$as_me:$LINENO: checking for --with-nss" >&5
+echo $ECHO_N "checking for --with-nss... $ECHO_C" >&6
- if test -e "$withval"/include/ldap.h -a -d "$withval"/lib
+# Check whether --with-nss or --without-nss was given.
+if test "${with_nss+set}" = set; then
+ withval="$with_nss"
+
+ if test -e "$withval"/include/nss.h -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- LDAPSDKDIR="$withval"
- LDAPSDKLIBDIR="$withval/lib"
- ldapsdk_inc="-I$LDAPSDKDIR/include"
- ldapsdk_lib="-L$LDAPSDKDIR/lib"
+ NSSDIR=$withval
+ nss_inc="-I$NSSDIR/include"
+ nss_lib="-L$NSSDIR/lib"
+ nss_libdir="$NSSDIR/lib"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19461,19 +19512,19 @@
echo "${ECHO_T}no" >&6
fi;
-# check for --with-ldapsdk-inc
-echo "$as_me:$LINENO: checking for --with-ldapsdk-inc" >&5
-echo $ECHO_N "checking for --with-ldapsdk-inc... $ECHO_C" >&6
+# check for --with-nss-inc
+echo "$as_me:$LINENO: checking for --with-nss-inc" >&5
+echo $ECHO_N "checking for --with-nss-inc... $ECHO_C" >&6
-# Check whether --with-ldapsdk-inc or --without-ldapsdk-inc was given.
-if test "${with_ldapsdk_inc+set}" = set; then
- withval="$with_ldapsdk_inc"
+# Check whether --with-nss-inc or --without-nss-inc was given.
+if test "${with_nss_inc+set}" = set; then
+ withval="$with_nss_inc"
- if test -e "$withval"/ldap.h
+ if test -e "$withval"/nss.h
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- ldapsdk_inc="-I$withval"
+ nss_inc="-I$withval"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19486,20 +19537,20 @@
echo "${ECHO_T}no" >&6
fi;
-# check for --with-ldapsdk-lib
-echo "$as_me:$LINENO: checking for --with-ldapsdk-lib" >&5
-echo $ECHO_N "checking for --with-ldapsdk-lib... $ECHO_C" >&6
+# check for --with-nss-lib
+echo "$as_me:$LINENO: checking for --with-nss-lib" >&5
+echo $ECHO_N "checking for --with-nss-lib... $ECHO_C" >&6
-# Check whether --with-ldapsdk-lib or --without-ldapsdk-lib was given.
-if test "${with_ldapsdk_lib+set}" = set; then
- withval="$with_ldapsdk_lib"
+# Check whether --with-nss-lib or --without-nss-lib was given.
+if test "${with_nss_lib+set}" = set; then
+ withval="$with_nss_lib"
if test -d "$withval"
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- LDAPSDKLIBDIR="$withval"
- ldapsdk_lib="-L$withval"
+ nss_lib="-L$withval"
+ nss_libdir="$withval"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19512,12 +19563,10 @@
echo "${ECHO_T}no" >&6
fi;
-# if LDAPSDK is not found yet, try pkg-config
+# if NSS is not found yet, try pkg-config
# last resort
-if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
- echo "$as_me:$LINENO: checking for mozldap with pkg-config" >&5
-echo $ECHO_N "checking for mozldap with pkg-config... $ECHO_C" >&6
+if test -z "$nss_inc" -o -z "$nss_lib" -o -z "$nss_libdir"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19557,71 +19606,236 @@
echo "${ECHO_T}no" >&6
fi
+ echo "$as_me:$LINENO: checking for nss with pkg-config" >&5
+echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists mozldap6; then
- ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap6`
- ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap6`
- ldapsdk_ver=60
- elif $PKG_CONFIG --exists mozldap; then
- ldapsdk_inc=`$PKG_CONFIG --cflags-only-I mozldap`
- ldapsdk_lib=`$PKG_CONFIG --libs-only-L mozldap`
- ldapsdk_ver=60
+ if $PKG_CONFIG --exists nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L nss`
+ nss_libdir=`$PKG_CONFIG --variable=libdir nss`
+ echo "$as_me:$LINENO: result: using system NSS" >&5
+echo "${ECHO_T}using system NSS" >&6
+ elif $PKG_CONFIG --exists dirsec-nss; then
+ nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
+ nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
+ nss_libdir=`$PKG_CONFIG --variable=libdir dirsec-nss`
+ echo "$as_me:$LINENO: result: using system dirsec NSS" >&5
+echo "${ECHO_T}using system dirsec NSS" >&6
else
- { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5
-echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;}
+ { { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5
+echo "$as_me: error: NSS not found, specify with --with-nss." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
fi
-if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
- { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5
-echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;}
+
+# 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
+# -*- 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
+ fi
-if test -z "$ldapsdk_ver" ; then
- # figure out version of ldapsdk - if we find a 60 version, break, use it
- # otherwise, keep looking
- for file in $LDAPSDKLIBDIR/libldap??.so* ; do
- case $file in
- *libldap60.so*) ldapsdk_ver=60 ; break ;;
- *) ldapsdk_ver=50 ;;
- esac
- done
+ 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
-{ echo "$as_me:$LINENO: checking for ADMINUTIL..." >&5
-echo "$as_me: checking for ADMINUTIL..." >&6;}
+# 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
-# check for --with-adminutil
-echo "$as_me:$LINENO: checking for --with-adminutil" >&5
-echo $ECHO_N "checking for --with-adminutil... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for LDAPSDK..." >&5
+echo "$as_me: checking for LDAPSDK..." >&6;}
-# Check whether --with-adminutil or --without-adminutil was given.
-if test "${with_adminutil+set}" = set; then
- withval="$with_adminutil"
+# check for --with-ldapsdk
+echo "$as_me:$LINENO: checking for --with-ldapsdk" >&5
+echo $ECHO_N "checking for --with-ldapsdk... $ECHO_C" >&6
- if test -d "$withval"/include -a -d "$withval"/lib
+# Check whether --with-ldapsdk or --without-ldapsdk was given.
+if test "${with_ldapsdk+set}" = set; then
+ withval="$with_ldapsdk"
+
+ if test -e "$withval"/include/ldap.h -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- ADMINUTILDIR=$withval
- adminutil_lib="-L$ADMINUTILDIR/lib"
- # check for version - only needed for older adminutil versions
- for file in $ADMINUTILDIR/lib/* ; do
- echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([0-9][0-9]\).*/\1/'` ; break
- done
- # use the latest one
- adminutil_incdir=`ls -1d $ADMINUTILDIR/include/adminutil-* | sort -n | tail -1`
- if ! test -n "$adminutil_incdir" -a -d "$adminutil_incdir" ; then
- adminutil_incdir=$ADMINUTILDIR/include
- fi
- if ! test -e "$adminutil_incdir/libadminutil/admutil.h" ; then
- { { echo "$as_me:$LINENO: error: $withval include dir not found" >&5
-echo "$as_me: error: $withval include dir not found" >&2;}
+ LDAPSDKDIR=$withval
+ ldapsdk_inc="-I$LDAPSDKDIR/include"
+ ldapsdk_lib="-L$LDAPSDKDIR/lib"
+ ldapsdk_libdir="$LDAPSDKDIR/lib"
+ ldapsdk_bindir="$LDAPSDKDIR/bin"
+ else
+ echo
+ { { echo "$as_me:$LINENO: error: $withval not found" >&5
+echo "$as_me: error: $withval not found" >&2;}
{ (exit 1); exit 1; }; }
- fi
- adminutil_inc="-I$adminutil_incdir"
+ fi
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+# check for --with-ldapsdk-inc
+echo "$as_me:$LINENO: checking for --with-ldapsdk-inc" >&5
+echo $ECHO_N "checking for --with-ldapsdk-inc... $ECHO_C" >&6
+
+# Check whether --with-ldapsdk-inc or --without-ldapsdk-inc was given.
+if test "${with_ldapsdk_inc+set}" = set; then
+ withval="$with_ldapsdk_inc"
+
+ if test -e "$withval"/ldap.h
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ ldapsdk_inc="-I$withval"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19634,12 +19848,36 @@
echo "${ECHO_T}no" >&6
fi;
-# if ADMINUTIL is not found yet, try pkg-config
+# check for --with-ldapsdk-lib
+echo "$as_me:$LINENO: checking for --with-ldapsdk-lib" >&5
+echo $ECHO_N "checking for --with-ldapsdk-lib... $ECHO_C" >&6
+
+# Check whether --with-ldapsdk-lib or --without-ldapsdk-lib was given.
+if test "${with_ldapsdk_lib+set}" = set; then
+ withval="$with_ldapsdk_lib"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ ldapsdk_lib="-L$withval"
+ ldapsdk_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 LDAPSDK is not found yet, try pkg-config
# last resort
-if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
- echo "$as_me:$LINENO: checking for adminutil with pkg-config" >&5
-echo $ECHO_N "checking for adminutil with pkg-config... $ECHO_C" >&6
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib" -o -z "$ldapsdk_libdir" -o -z "$ldapsdk_bindir"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19679,25 +19917,129 @@
echo "${ECHO_T}no" >&6
fi
+ echo "$as_me:$LINENO: checking for mozldap with pkg-config" >&5
+echo $ECHO_N "checking for mozldap with pkg-config... $ECHO_C" >&6
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists adminutil; then
- adminutil_inc=`$PKG_CONFIG --cflags-only-I adminutil`
- adminutil_lib=`$PKG_CONFIG --libs-only-L adminutil`
+ if $PKG_CONFIG --exists mozldap6; then
+ mozldappkg=mozldap6
+ elif $PKG_CONFIG --exists mozldap; then
+ mozldappkg=mozldap
else
- { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-adminutil." >&5
-echo "$as_me: error: ADMINUTIL not found, specify with --with-adminutil." >&2;}
+ { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5
+echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;}
{ (exit 1); exit 1; }; }
fi
+ ldapsdk_inc=`$PKG_CONFIG --cflags-only-I $mozldappkg`
+ ldapsdk_libdir=`$PKG_CONFIG --variable=libdir $mozldappkg`
+ ldapsdk_lib="-L$ldapsdk_libdir"
+ ldapsdk_bindir=`$PKG_CONFIG --variable=bindir $mozldappkg`
+ echo "$as_me:$LINENO: result: using system $mozldappkg" >&5
+echo "${ECHO_T}using system $mozldappkg" >&6
+ fi
+fi
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
+ { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&5
+echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk-inc|-lib." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "$ldapsdk_bindir" ; then
+ if -d $libdir/mozldap6 ; then
+ ldapsdk_bindir=$libdir/mozldap6
+ else
+ ldapsdk_bindir=$libdir/mozldap
fi
fi
-if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
- { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-adminutil." >&5
-echo "$as_me: error: ADMINUTIL not found, specify with --with-adminutil." >&2;}
+save_cppflags="$CPPFLAGS"
+CPPFLAGS="$ldapsdk_inc $nss_inc $nspr_inc"
+echo "$as_me:$LINENO: checking for ldap.h" >&5
+echo $ECHO_N "checking for ldap.h... $ECHO_C" >&6
+if test "${ac_cv_header_ldap_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ldap-standard.h>
+#if LDAP_VENDOR_VERSION < 600
+#error The LDAP C SDK version is not supported
+#endif
+
+
+#include <ldap.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_header_ldap_h=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_header_ldap_h=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_ldap_h" >&5
+echo "${ECHO_T}$ac_cv_header_ldap_h" >&6
+if test $ac_cv_header_ldap_h = yes; then
+ isversion6=1
+else
+ isversion6=
+fi
+
+
+CPPFLAGS="$save_cppflags"
+
+if test -z "$isversion6" ; then
+ { { echo "$as_me:$LINENO: error: The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported" >&5
+echo "$as_me: error: The LDAPSDK version in $ldapsdk_inc/ldap-standard.h is not supported" >&2;}
{ (exit 1); exit 1; }; }
fi
-###################################3
+
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 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 LIBICU..." >&5
echo "$as_me: checking for LIBICU..." >&6;}
@@ -19713,65 +20055,104 @@
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- ICUDIR=$withval
+ ICUDIR="$withval"
icu_lib="-L$ICUDIR/lib"
+ icu_libdir="$ICUDIR/lib"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
echo "$as_me: error: $withval not found" >&2;}
{ (exit 1); exit 1; }; }
fi
+ icu_inc="-I$withval/include"
+ icu_bin="$withval/bin"
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi;
-# if ICU is not found yet, try pkg-config
+# check for --with-icu-inc
+echo "$as_me:$LINENO: checking for --with-icu-inc" >&5
+echo $ECHO_N "checking for --with-icu-inc... $ECHO_C" >&6
+
+# Check whether --with-icu-inc or --without-icu-inc was given.
+if test "${with_icu_inc+set}" = set; then
+ withval="$with_icu_inc"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ icu_inc="-I$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
-# last resort
-if test -z "$icu_lib"; then
- echo "$as_me:$LINENO: checking for icu with pkg-config" >&5
-echo $ECHO_N "checking for icu with pkg-config... $ECHO_C" >&6
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+# check for --with-icu-lib
+echo "$as_me:$LINENO: checking for --with-icu-lib" >&5
+echo $ECHO_N "checking for --with-icu-lib... $ECHO_C" >&6
+
+# Check whether --with-icu-lib or --without-icu-lib was given.
+if test "${with_icu_lib+set}" = set; then
+ withval="$with_icu_lib"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ icu_lib="-L$withval"
+ icu_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
-done
-done
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+# check for --with-icu-bin
+echo "$as_me:$LINENO: checking for --with-icu-bin" >&5
+echo $ECHO_N "checking for --with-icu-bin... $ECHO_C" >&6
+
+# Check whether --with-icu-bin or --without-icu-bin was given.
+if test "${with_icu_bin+set}" = set; then
+ withval="$with_icu_bin"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ icu_bin="$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
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
-fi
+fi;
+# if ICU is not found yet, try pkg-config
+# last resort
+if test -z "$icu_lib"; then
+ echo "$as_me:$LINENO: checking for icu with icu-config" >&5
+echo $ECHO_N "checking for icu with icu-config... $ECHO_C" >&6
# Extract the first word of "icu-config", so it can be a program name with args.
set dummy icu-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19811,97 +20192,65 @@
echo "${ECHO_T}no" >&6
fi
- if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists icu; then
- icu_lib=`$PKG_CONFIG --libs-only-L icu`
- fi
- fi
- if test -z "$icu_lib" ; then
- if test -n "$ICU_CONFIG" ; then
- icu_lib=`$ICU_CONFIG --ldflags-searchpath`
- fi
- fi
- if test -z "$icu_lib" ; then
+ if test -n "$ICU_CONFIG"; then
+ icu_lib=`$ICU_CONFIG --ldflags-searchpath`
+ icu_libdir=`$ICU_CONFIG --libdir`
+ icu_inc=`$ICU_CONFIG --cppflags-searchpath`
+ icu_bin=`$ICU_CONFIG --bindir`
+ echo "$as_me:$LINENO: result: using system ICU" >&5
+echo "${ECHO_T}using system ICU" >&6
+ else
{ { echo "$as_me:$LINENO: error: ICU not found, specify with --with-icu." >&5
echo "$as_me: error: ICU not found, specify with --with-icu." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
-if test -z "$icu_lib"; then
- { { echo "$as_me:$LINENO: error: ICU not found, specify with --with-icu." >&5
-echo "$as_me: error: ICU not found, specify with --with-icu." >&2;}
- { (exit 1); exit 1; }; }
-fi
-###################################3
-{ echo "$as_me:$LINENO: checking for NSS..." >&5
-echo "$as_me: checking for NSS..." >&6;}
-
-# check for --with-nss
-echo "$as_me:$LINENO: checking for --with-nss" >&5
-echo $ECHO_N "checking for --with-nss... $ECHO_C" >&6
-
-# Check whether --with-nss or --without-nss was given.
-if test "${with_nss+set}" = set; then
- withval="$with_nss"
-
- if test -e "$withval"/include/nss.h -a -d "$withval"/lib
- then
- echo "$as_me:$LINENO: result: using $withval" >&5
-echo "${ECHO_T}using $withval" >&6
- NSSDIR=$withval
- nss_inc="-I$NSSDIR/include"
- nss_lib="-L$NSSDIR/lib"
- else
- echo
- { { echo "$as_me:$LINENO: error: $withval not found" >&5
-echo "$as_me: error: $withval not found" >&2;}
- { (exit 1); exit 1; }; }
- fi
+# BEGIN COPYRIGHT BLOCK
+# Copyright (C) 2006 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
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi;
+{ echo "$as_me:$LINENO: checking for ADMINUTIL..." >&5
+echo "$as_me: checking for ADMINUTIL..." >&6;}
-# check for --with-nss-inc
-echo "$as_me:$LINENO: checking for --with-nss-inc" >&5
-echo $ECHO_N "checking for --with-nss-inc... $ECHO_C" >&6
+# check for --with-adminutil
+echo "$as_me:$LINENO: checking for --with-adminutil" >&5
+echo $ECHO_N "checking for --with-adminutil... $ECHO_C" >&6
-# Check whether --with-nss-inc or --without-nss-inc was given.
-if test "${with_nss_inc+set}" = set; then
- withval="$with_nss_inc"
+# Check whether --with-adminutil or --without-adminutil was given.
+if test "${with_adminutil+set}" = set; then
+ withval="$with_adminutil"
- if test -e "$withval"/nss.h
+ if test -d "$withval"/include -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
- nss_inc="-I$withval"
- else
- echo
- { { echo "$as_me:$LINENO: error: $withval not found" >&5
-echo "$as_me: error: $withval not found" >&2;}
+ ADMINUTILDIR=$withval
+ adminutil_lib="-L$ADMINUTILDIR/lib"
+ adminutil_libdir="$ADMINUTILDIR/lib"
+ adminutil_incdir=$ADMINUTILDIR/include
+ if ! test -e "$adminutil_incdir/libadminutil/admutil.h" ; then
+ { { echo "$as_me:$LINENO: error: $withval include dir not found" >&5
+echo "$as_me: error: $withval include dir not found" >&2;}
{ (exit 1); exit 1; }; }
- fi
-
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi;
-
-# check for --with-nss-lib
-echo "$as_me:$LINENO: checking for --with-nss-lib" >&5
-echo $ECHO_N "checking for --with-nss-lib... $ECHO_C" >&6
-
-# Check whether --with-nss-lib or --without-nss-lib was given.
-if test "${with_nss_lib+set}" = set; then
- withval="$with_nss_lib"
-
- if test -d "$withval"
- then
- echo "$as_me:$LINENO: result: using $withval" >&5
-echo "${ECHO_T}using $withval" >&6
- nss_lib="-L$withval"
+ fi
+ adminutil_inc="-I$adminutil_incdir"
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -19914,12 +20263,12 @@
echo "${ECHO_T}no" >&6
fi;
-# if NSS is not found yet, try pkg-config
+# if ADMINUTIL is not found yet, try pkg-config
# last resort
-if test -z "$nss_inc" -o -z "$nss_lib"; then
- echo "$as_me:$LINENO: checking for nss with pkg-config" >&5
-echo $ECHO_N "checking for nss with pkg-config... $ECHO_C" >&6
+if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
+ echo "$as_me:$LINENO: checking for adminutil with pkg-config" >&5
+echo $ECHO_N "checking for adminutil with pkg-config... $ECHO_C" >&6
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -19960,24 +20309,25 @@
fi
if test -n "$PKG_CONFIG"; then
- if $PKG_CONFIG --exists nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I nss`
- nss_lib=`$PKG_CONFIG --libs-only-L nss`
- echo "$as_me:$LINENO: result: using system NSS" >&5
-echo "${ECHO_T}using system NSS" >&6
- elif $PKG_CONFIG --exists dirsec-nss; then
- nss_inc=`$PKG_CONFIG --cflags-only-I dirsec-nss`
- nss_lib=`$PKG_CONFIG --libs-only-L dirsec-nss`
- echo "$as_me:$LINENO: result: using system dirsec NSS" >&5
-echo "${ECHO_T}using system dirsec NSS" >&6
+ if $PKG_CONFIG --exists adminutil; then
+ adminutil_inc=`$PKG_CONFIG --cflags-only-I adminutil`
+ adminutil_lib=`$PKG_CONFIG --libs-only-L adminutil`
+ adminutil_libdir=`$PKG_CONFIG --libs-only-L adminutil | sed -e s/-L// | sed -e s/\ .*$//`
else
- { { echo "$as_me:$LINENO: error: NSS not found, specify with --with-nss." >&5
-echo "$as_me: error: NSS not found, specify with --with-nss." >&2;}
+ { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-adminutil." >&5
+echo "$as_me: error: ADMINUTIL not found, specify with --with-adminutil." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
fi
+if test -z "$adminutil_inc" -o -z "$adminutil_lib"; then
+ { { echo "$as_me:$LINENO: error: ADMINUTIL not found, specify with --with-adminutil." >&5
+echo "$as_me: error: ADMINUTIL not found, specify with --with-adminutil." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
# building with adminserver or standalone?
# Check whether --with-adminserver or --without-adminserver was given.
@@ -20003,6 +20353,8 @@
# Substitute values
+# write out paths for binary components
+
@@ -20800,6 +21152,7 @@
s, at icu_lib@,$icu_lib,;t t
s, at nss_inc@,$nss_inc,;t t
s, at nss_lib@,$nss_lib,;t t
+s, at sasl_lib@,$sasl_lib,;t t
s, at extra_cppflags@,$extra_cppflags,;t t
s, at moddir@,$moddir,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.in 21 Jun 2007 23:17:48 -0000 1.25
+++ Makefile.in 17 Aug 2007 18:41:16 -0000 1.26
@@ -44,7 +44,10 @@
missing mkinstalldirs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/nspr.m4 $(top_srcdir)/nss.m4 \
+ $(top_srcdir)/sasl.m4 $(top_srcdir)/mozldap.m4 \
+ $(top_srcdir)/icu.m4 $(top_srcdir)/adminutil.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -229,6 +232,7 @@
platform_defs = @platform_defs@
prefix = @prefix@
program_transform_name = @program_transform_name@
+sasl_lib = @sasl_lib@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -239,7 +243,7 @@
mod_admserv_la_SOURCES = mod_admserv.c
mod_admserv_la_CPPFLAGS = $(AM_CPPFLAGS) -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@ @extra_cppflags@
mod_admserv_la_LDFLAGS = -module -avoid-version
-mod_admserv_la_LIBADD = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap at ldapsdk_ver@ -lprldap at ldapsdk_ver@ -lldap at ldapsdk_ver@ @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 $(LIBCSTD) $(LIBCRUN)
+mod_admserv_la_LIBADD = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @icu_lib@ -licui18n -licuuc -licudata @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 @nss_lib@ -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4 @sasl_lib@ -lsasl2 $(LIBCSTD) $(LIBCRUN)
@CXXLINK_REQUIRED_FALSE at mod_admserv_la_LINK = $(LINK) $(mod_admserv_la_LDFLAGS)
@CXXLINK_REQUIRED_TRUE at mod_admserv_la_LINK = $(CXXLINK) $(mod_admserv_la_LDFLAGS)
all: all-am
- Previous message (by thread): [Fedora-directory-commits] adminserver configure.ac, 1.18, 1.19 aclocal.m4, 1.29, 1.30 configure, 1.32, 1.33 missing, 1.20, 1.21 install-sh, 1.20, 1.21 depcomp, 1.20, 1.21 config.sub, 1.20, 1.21 config.guess, 1.20, 1.21 compile, 1.19, 1.20 Makefile.in, 1.35, 1.36
- Next message (by thread): [Fedora-directory-commits] console buildnum.pl,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Fedora-directory-commits
mailing list