[Fedora-directory-commits] mod_admserv aclocal.m4, 1.4, 1.5 Makefile.am, 1.7, 1.8 Makefile.in, 1.10, 1.11 configure.in, 1.9, 1.10 configure, 1.11, 1.12

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	aclocal.m4 Makefile.am Makefile.in configure.in configure 
Log Message:
This allows the mod_admserv configure to figure out what adminutil 
version to use.  It looks in the given directory and extracts the 
version number from the end of the first matching libadminutil.





Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am	19 Aug 2005 14:49:57 -0000	1.7
+++ Makefile.am	28 Oct 2005 01:57:54 -0000	1.8
@@ -6,7 +6,7 @@
 
 ## Set the includes and libraries needed
 INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil71 -ladmsslutil71 @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
 
 install-libLTLIBRARIES: libmodadmserv.la
 	@APXS@ -i -a -n admserv libmodadmserv.la


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in	26 Sep 2005 19:52:01 -0000	1.10
+++ Makefile.in	28 Oct 2005 01:57:54 -0000	1.11
@@ -85,6 +85,7 @@
 VERSION = @VERSION@
 adminutil_inc = @adminutil_inc@
 adminutil_lib = @adminutil_lib@
+adminutil_ver = @adminutil_ver@
 am__include = @am__include@
 am__quote = @am__quote@
 apache_bin = @apache_bin@
@@ -103,7 +104,7 @@
 libmodadmserv_la_SOURCES = mod_admserv.c
 
 INCLUDES = -I at apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil71 -ladmsslutil71 @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
 
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \


Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in	26 Sep 2005 19:40:08 -0000	1.9
+++ configure.in	28 Oct 2005 01:57:54 -0000	1.10
@@ -225,6 +225,13 @@
     ADMINUTILDIR=$withval
     adminutil_inc="-I$ADMINUTILDIR/include"
     adminutil_lib="-L$ADMINUTILDIR/lib"
+    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
+    if test -z "$adminutil_ver"
+    then
+      adminutil_ver=10
+    fi
   else
     echo
     AC_MSG_ERROR([$withval not found])
@@ -313,6 +320,7 @@
 AC_SUBST(ldapsdk_lib)
 AC_SUBST(adminutil_inc)
 AC_SUBST(adminutil_lib)
+AC_SUBST(adminutil_ver)
 AC_SUBST(nss_inc)
 AC_SUBST(nss_lib)
 


Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure	26 Sep 2005 19:52:01 -0000	1.11
+++ configure	28 Oct 2005 01:57:54 -0000	1.12
@@ -466,7 +466,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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib nss_inc nss_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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver nss_inc nss_lib LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -8588,6 +8588,13 @@
     ADMINUTILDIR=$withval
     adminutil_inc="-I$ADMINUTILDIR/include"
     adminutil_lib="-L$ADMINUTILDIR/lib"
+    for file in $ADMINUTILDIR/lib/* ; do
+      echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\(0-90-9\).*/\1/'` ; break
+    done
+    if test -z "$adminutil_ver"
+    then
+      adminutil_ver=10
+    fi
   else
     echo
     { { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -8758,6 +8765,7 @@
 
 
 
+
 # Write config.status and the Makefile
           ac_config_files="$ac_config_files Makefile"
 cat >confcache <<\_ACEOF
@@ -9472,6 +9480,7 @@
 s, at ldapsdk_lib@,$ldapsdk_lib,;t t
 s, at adminutil_inc@,$adminutil_inc,;t t
 s, at adminutil_lib@,$adminutil_lib,;t t
+s, at adminutil_ver@,$adminutil_ver,;t t
 s, at nss_inc@,$nss_inc,;t t
 s, at nss_lib@,$nss_lib,;t t
 s, at LIBOBJS@,$LIBOBJS,;t t