[Fedora-directory-commits] mod_admserv configure.in,1.7,1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572

Modified Files:
	configure.in 
Log Message:
added separate inc and lib directives for nspr, nss, and ldapsdk to facilitate building from mozilla build tree


Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.in	14 Sep 2005 01:08:27 -0000	1.7
+++ configure.in	24 Sep 2005 02:58:19 -0000	1.8
@@ -57,7 +57,7 @@
 # if no apxs found yet, check /usr/local/apache/sbin
 # since it's the default Apache location
 if test -z "$APXS"; then
-  AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin)
+  AC_MSG_CHECKING(for apxs in /usr/local/apache/sbin and /usr/sbin)
   if test -x /usr/local/apache/sbin/apxs; then
     APXS=/usr/local/apache/sbin/apxs
     AC_MSG_RESULT([found $APXS. Use --with-apxs to specify another.])
@@ -101,7 +101,7 @@
 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
+  if test -e "$withval"/include/nspr.h -a -d "$withval"/lib
   then
     AC_MSG_RESULT([using $withval])
     NSPRDIR=$withval
@@ -114,10 +114,40 @@
 ],
 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 "$NSPRDIR"; then
+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
@@ -136,7 +166,7 @@
 AC_MSG_CHECKING(for --with-ldapsdk)
 AC_ARG_WITH(ldapsdk, [  --with-ldapsdk=PATH     Mozilla LDAP SDK directory],
 [
-  if test -e "$withval"/include/ldap.h
+  if test -e "$withval"/include/ldap.h -a -d "$withval"/lib
   then
     AC_MSG_RESULT([using $withval])
     LDAPSDKDIR=$withval
@@ -149,8 +179,38 @@
 ],
 AC_MSG_RESULT(no))
 
-if test -z "$LDAPSDKDIR"; then
-  AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk.])
+# 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"
+  else
+    echo
+    AC_MSG_ERROR([$withval not found])
+  fi
+],
+AC_MSG_RESULT(no))
+
+if test -z "$ldapsdk_inc" -o -z "$ldapsdk_lib"; then
+  AC_MSG_ERROR([LDAPSDK not found, specify with --with-ldapsdk[-inc|-lib].])
 fi
 
 AC_CHECKING(for ADMINUTIL)
@@ -159,7 +219,7 @@
 AC_MSG_CHECKING(for --with-adminutil)
 AC_ARG_WITH(adminutil, [  --with-adminutil=PATH   Adminutil directory],
 [
-  if test -e "$withval"/include/libadminutil/admutil.h
+  if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib
   then
     AC_MSG_RESULT([using $withval])
     ADMINUTILDIR=$withval
@@ -182,7 +242,7 @@
 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
+  if test -e "$withval"/include/nss.h -a -d "$withval"/lib
   then
     AC_MSG_RESULT([using $withval])
     NSSDIR=$withval
@@ -195,10 +255,40 @@
 ],
 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 "$NSSDIR"; then
+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