[Fedora-directory-commits] mod_revocator Makefile.am, 1.1.1.1, 1.2 configure.in, 1.1.1.1, 1.2 aclocal.m4, 1.1.1.1, 1.2 Makefile.in, 1.1.1.1, 1.2 configure, 1.1.1.1, 1.2
Robert Crittenden (rcritten)
fedora-directory-commits at redhat.com
Mon Aug 7 20:27:58 UTC 2006
Author: rcritten
Update of /cvs/dirsec/mod_revocator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21305
Modified Files:
Makefile.am configure.in aclocal.m4 Makefile.in configure
Log Message:
- Remove unused variables nss_dir and nspr_dir
- Fix error message if LDAPSDK is not found.
- If using pkg-config for NSS configuration and nss_lib is empty, populate
nss_dir with /usr/lib/and set nss_lib_dir as well.
- Fix test for libnssb.a
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_revocator/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure.in 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ configure.in 7 Aug 2006 20:27:55 -0000 1.2
@@ -231,6 +231,11 @@
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
+ nss_lib_dir=$nss_lib
+ if test "$nss_lib" = " "; then
+ nss_lib=-L"/usr/lib"
+ nss_lib_dir="/usr/lib"
+ fi
else
AC_MSG_ERROR([NSS not found, specify with --with-nss.])
fi
@@ -258,7 +263,7 @@
# check for --with-ldapsdk-inc
AC_MSG_CHECKING(for --with-ldapsdk-inc)
-AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH LDAP SDK include directory],
+AC_ARG_WITH(ldapsdk-inc, [ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory],
[
if test -e "$withval"/ldap.h
then
@@ -273,7 +278,7 @@
# check for --with-ldapsdk-lib
AC_MSG_CHECKING(for --with-ldapsdk-lib)
-AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH LDAP SDK library directory],
+AC_ARG_WITH(ldapsdk-lib, [ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory],
[
if test -d "$withval"
then
@@ -300,10 +305,7 @@
fi
fi
-nspr_dir=`echo "$nspr_lib" | sed 's/\/lib[[/]]*$//' | sed 's/-L//'`
-nss_dir=`echo "$nss_lib" | sed 's/\/lib[[/]]*$//' | sed 's/-L//'`
-
-if ! test -e "$nss_dir"/libnssb.a
+if ! test -e "$nss_lib_dir"/libnssb.a
then
AC_MSG_ERROR([NSS is installed but the PKCS11 development package is missing. Need libnssb.a])
fi
@@ -322,8 +324,6 @@
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
AC_SUBST(nss_lib_dir)
-AC_SUBST(nspr_dir)
-AC_SUBST(nss_dir)
AC_SUBST(ldapsdk_inc)
AC_SUBST(ldapsdk_lib)
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_revocator/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile.in 3 Aug 2006 19:39:12 -0000 1.1.1.1
+++ Makefile.in 7 Aug 2006 20:27:55 -0000 1.2
@@ -107,10 +107,8 @@
install_sh = @install_sh@
ldapsdk_inc = @ldapsdk_inc@
ldapsdk_lib = @ldapsdk_lib@
-nspr_dir = @nspr_dir@
nspr_inc = @nspr_inc@
nspr_lib = @nspr_lib@
-nss_dir = @nss_dir@
nss_inc = @nss_inc@
nss_lib = @nss_lib@
nss_lib_dir = @nss_lib_dir@
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_revocator/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- configure 3 Aug 2006 19:39:29 -0000 1.1.1.1
+++ configure 7 Aug 2006 20:27:55 -0000 1.2
@@ -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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT APR_CONFIG APXS PKG_CONFIG SHARED_LINK apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags nspr_!
inc nspr_lib nss_inc nss_lib nss_lib_dir nspr_dir nss_dir ldapsdk_inc ldapsdk_lib 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 PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE CC CFLAGS ac_ct_CC CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT APR_CONFIG APXS PKG_CONFIG SHARED_LINK apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags nspr_!
inc nspr_lib nss_inc nss_lib nss_lib_dir ldapsdk_inc ldapsdk_lib LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1049,8 +1049,8 @@
--with-nss-inc=PATH Network Security Services (NSS) include directory
--with-nss-lib=PATH Network Security Services (NSS) library directory
--with-ldapsdk=PATH LDAP SDK directory
- --with-ldapsdk-inc=PATH LDAP SDK include directory
- --with-ldapsdk-lib=PATH LDAP SDK library directory
+ --with-ldapsdk-inc=PATH Mozilla LDAP SDK include directory
+ --with-ldapsdk-lib=PATH Mozilla LDAP SDK library directory
Some influential environment variables:
CXX C++ compiler command
@@ -20704,6 +20704,11 @@
if $PKG_CONFIG --exists nss; then
nss_inc=`$PKG_CONFIG --cflags-only-I nss`
nss_lib=`$PKG_CONFIG --libs-only-L nss`
+ nss_lib_dir=$nss_lib
+ if test "$nss_lib" = " "; then
+ nss_lib=-L"/usr/lib"
+ nss_lib_dir="/usr/lib"
+ fi
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;}
@@ -20847,10 +20852,7 @@
fi
fi
-nspr_dir=`echo "$nspr_lib" | sed 's/\/lib[/]*$//' | sed 's/-L//'`
-nss_dir=`echo "$nss_lib" | sed 's/\/lib[/]*$//' | sed 's/-L//'`
-
-if ! test -e "$nss_dir"/libnssb.a
+if ! test -e "$nss_lib_dir"/libnssb.a
then
{ { echo "$as_me:$LINENO: error: NSS is installed but the PKCS11 development package is missing. Need libnssb.a" >&5
echo "$as_me: error: NSS is installed but the PKCS11 development package is missing. Need libnssb.a" >&2;}
@@ -20874,8 +20876,6 @@
-
-
# Write config.status and the Makefile
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@@ -21607,8 +21607,6 @@
s, at nss_inc@,$nss_inc,;t t
s, at nss_lib@,$nss_lib,;t t
s, at nss_lib_dir@,$nss_lib_dir,;t t
-s, at nspr_dir@,$nspr_dir,;t t
-s, at nss_dir@,$nss_dir,;t t
s, at ldapsdk_inc@,$ldapsdk_inc,;t t
s, at ldapsdk_lib@,$ldapsdk_lib,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
More information about the Fedora-directory-commits
mailing list