[Fedora-directory-commits] mod_admserv Makefile.am, 1.8, 1.9 Makefile.in, 1.11, 1.12 configure, 1.12, 1.13 configure.in, 1.10, 1.11

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	Makefile.am Makefile.in configure configure.in 
Log Message:
[172166] Admin Util RPM
Pick up new Admin Util; libadminutil.so[.1.0] format



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	28 Oct 2005 01:57:54 -0000	1.8
+++ Makefile.am	7 Dec 2005 02:04:52 -0000	1.9
@@ -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@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil -ladmsslutil @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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in	28 Oct 2005 01:57:54 -0000	1.11
+++ Makefile.in	7 Dec 2005 02:04:52 -0000	1.12
@@ -104,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@ -ladminutil at adminutil_ver@ -ladmsslutil at adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil -ladmsslutil @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
 
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \


Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure	28 Oct 2005 01:57:54 -0000	1.12
+++ configure	7 Dec 2005 02:04:54 -0000	1.13
@@ -8581,20 +8581,20 @@
 if test "${with_adminutil+set}" = set; then
   withval="$with_adminutil"
 
-  if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib
+  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
     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
+      echo $file | grep 'libadminutil0-90-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
+      adminutil_ver=1.0
     fi
+    adminutil_inc="-I$ADMINUTILDIR/include/adminutil-$adminutil_ver"
   else
     echo
     { { echo "$as_me:$LINENO: error: $withval not found" >&5


Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure.in	28 Oct 2005 01:57:54 -0000	1.10
+++ configure.in	7 Dec 2005 02:04:54 -0000	1.11
@@ -219,19 +219,19 @@
 AC_MSG_CHECKING(for --with-adminutil)
 AC_ARG_WITH(adminutil, [  --with-adminutil=PATH   Adminutil directory],
 [
-  if test -e "$withval"/include/libadminutil/admutil.h -a -d "$withval"/lib
+  if test -e "$withval"/include/*/libadminutil/admutil.h -a -d "$withval"/lib
   then
     AC_MSG_RESULT([using $withval])
     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
+      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
+      adminutil_ver=1.0
     fi
+    adminutil_inc="-I$ADMINUTILDIR/include/adminutil-$adminutil_ver"
   else
     echo
     AC_MSG_ERROR([$withval not found])