[Fedora-directory-commits] mod_admserv aclocal.m4, 1.2, 1.3 Makefile.in, 1.8, 1.9 configure, 1.8, 1.9
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Sat Sep 24 03:09:27 UTC 2005
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12936
Modified Files:
aclocal.m4 Makefile.in configure
Log Message:
added separate directives for nspr, nss, and ldapsdk include and library paths to facilitate building with mozilla source tree
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- configure 14 Sep 2005 14:32:34 -0000 1.8
+++ configure 24 Sep 2005 03:09:23 -0000 1.9
@@ -1021,9 +1021,15 @@
--with-apr-config Use apr-config to determine the APR directory
--with-apxs=PATH Path to apxs
--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-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-adminutil=PATH Adminutil 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
Some influential environment variables:
CC C compiler command
@@ -4538,7 +4544,7 @@
case $host in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4541 "configure"' > conftest.$ac_ext
+ echo '#line 4547 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5067,7 +5073,7 @@
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
compiler_c_o=no
-if { (eval echo configure:5070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
if test -s out/conftest.err; then
@@ -6251,7 +6257,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*)
- echo '#line 6254 "configure"' > conftest.$ac_ext
+ echo '#line 6260 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6923,7 +6929,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 6926 "configure"
+#line 6932 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -7021,7 +7027,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 7024 "configure"
+#line 7030 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8255,8 +8261,8 @@
# if no apxs found yet, check /usr/local/apache/sbin
# since it's the default Apache location
if test -z "$APXS"; then
- echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin" >&5
-echo $ECHO_N "checking for apxs in /usr/local/apache/sbin... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for apxs in /usr/local/apache/sbin and /usr/sbin" >&5
+echo $ECHO_N "checking for apxs in /usr/local/apache/sbin and /usr/sbin... $ECHO_C" >&6
if test -x /usr/local/apache/sbin/apxs; then
APXS=/usr/local/apache/sbin/apxs
echo "$as_me:$LINENO: result: found $APXS. Use --with-apxs to specify another." >&5
@@ -8352,7 +8358,7 @@
if test "${with_nspr+set}" = set; then
withval="$with_nspr"
- if test -e "$withval"/include/nspr.h
+ if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
@@ -8371,10 +8377,60 @@
echo "${ECHO_T}no" >&6
fi;
+# check for --with-nspr-inc
+echo "$as_me:$LINENO: checking for --with-nspr-inc" >&5
+echo $ECHO_N "checking for --with-nspr-inc... $ECHO_C" >&6
+
+# Check whether --with-nspr-inc or --without-nspr-inc was given.
+if test "${with_nspr_inc+set}" = set; then
+ withval="$with_nspr_inc"
+
+ if test -e "$withval"/nspr.h
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ nspr_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
+
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
+# check for --with-nspr-lib
+echo "$as_me:$LINENO: checking for --with-nspr-lib" >&5
+echo $ECHO_N "checking for --with-nspr-lib... $ECHO_C" >&6
+
+# Check whether --with-nspr-lib or --without-nspr-lib was given.
+if test "${with_nspr_lib+set}" = set; then
+ withval="$with_nspr_lib"
+
+ if test -d "$withval"
+ then
+ echo "$as_me:$LINENO: result: using $withval" >&5
+echo "${ECHO_T}using $withval" >&6
+ nspr_lib="-L$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 NSPR is not found yet, try pkg-config
# last resort
-if test -z "$NSPRDIR"; then
+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
# Extract the first word of "pkg-config", so it can be a program name with args.
@@ -8439,7 +8495,7 @@
if test "${with_ldapsdk+set}" = set; then
withval="$with_ldapsdk"
- if test -e "$withval"/include/ldap.h
+ 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
@@ -8458,9 +8514,59 @@
echo "${ECHO_T}no" >&6
fi;
-if test -z "$LDAPSDKDIR"; then
- { { echo "$as_me:$LINENO: error: LDAPSDK not found, specify with --with-ldapsdk." >&5
-echo "$as_me: error: LDAPSDK not found, specify with --with-ldapsdk." >&2;}
+# 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
+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;
+
+# 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"
+ 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 "$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
@@ -8475,7 +8581,7 @@
if test "${with_adminutil+set}" = set; then
withval="$with_adminutil"
- if test -e "$withval"/include/libadminutil/admutil.h
+ if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib
then
echo "$as_me:$LINENO: result: using $withval" >&5
echo "${ECHO_T}using $withval" >&6
@@ -8511,7 +8617,7 @@
if test "${with_nss+set}" = set; then
withval="$with_nss"
- if test -e "$withval"/include/nss.h
+ 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
@@ -8530,10 +8636,60 @@
echo "${ECHO_T}no" >&6
fi;
+# 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-nss-inc or --without-nss-inc was given.
+if test "${with_nss_inc+set}" = set; then
+ withval="$with_nss_inc"
+
+ if test -e "$withval"/nss.h
+ 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;}
+ { (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"
+ 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 NSS is not found yet, try pkg-config
# last resort
-if test -z "$NSSDIR"; then
+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
# Extract the first word of "pkg-config", so it can be a program name with args.
More information about the Fedora-directory-commits
mailing list