Author: rmeggins
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30550/adminutil
Modified Files:
Makefile.am configure.ac aclocal.m4 configure missing
install-sh compile depcomp config.sub config.guess Makefile.in
Log Message:
Resolves: bug 250526
Bug Description: adminutil: should not link against libplds or libsoftokn
Reviewed by: nhosoi (Thanks!)
Fix Description: This causes problems for apps that link against adminutil. adminutil
does not need these libraries.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 22 Jun 2007 21:06:44 -0000 1.7
+++ Makefile.am 2 Aug 2007 03:18:03 -0000 1.8
@@ -17,8 +17,8 @@
#------------------------
# Linker Flags
#------------------------
-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4
+NSS_LINK = @nss_lib@ -lssl3 -lnss3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
if enable_tests
SASL_LINK = @sasl_lib@ -lsasl2
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminutil/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.ac 24 Jul 2007 18:40:44 -0000 1.7
+++ configure.ac 2 Aug 2007 03:18:03 -0000 1.8
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([adminutil], [1.1.3], [
http://bugzilla.redhat.com/])
+AC_INIT([adminutil], [1.1.4], [
http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminutil/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- configure 24 Jul 2007 18:40:44 -0000 1.10
+++ configure 2 Aug 2007 03:18:03 -0000 1.11
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for adminutil 1.1.3.
+# Generated by GNU Autoconf 2.59 for adminutil 1.1.4.
#
# Report bugs to <
http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='adminutil'
PACKAGE_TARNAME='adminutil'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='adminutil 1.1.3'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='adminutil 1.1.4'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -954,7 +954,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures adminutil 1.1.3 to adapt to many kinds of systems.
+\`configure' configures adminutil 1.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of adminutil 1.1.3:";;
+ short | recursive ) echo "Configuration of adminutil 1.1.4:";;
esac
cat <<\_ACEOF
@@ -1180,7 +1180,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-adminutil configure 1.1.3
+adminutil configure 1.1.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1194,7 +1194,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by adminutil $as_me 1.1.3, which was
+It was created by adminutil $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1837,7 +1837,7 @@
# Define the identity of the package.
PACKAGE='adminutil'
- VERSION='1.1.3'
+ VERSION='1.1.4'
cat >>confdefs.h <<_ACEOF
@@ -24367,7 +24367,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by adminutil $as_me 1.1.3, which was
+This file was extended by adminutil $as_me 1.1.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24425,7 +24425,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-adminutil config.status 1.1.3
+adminutil config.status 1.1.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed
's/[\\""\`\$]/\\\\&/g'`\\"
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminutil/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 24 Jul 2007 18:40:44 -0000 1.10
+++ Makefile.in 2 Aug 2007 03:18:03 -0000 1.11
@@ -325,8 +325,8 @@
#------------------------
# Linker Flags
#------------------------
-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
-NSS_LINK = @nss_lib@ -lssl3 -lnss3 -lsoftokn3
+NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4
+NSS_LINK = @nss_lib@ -lssl3 -lnss3
LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lldap60 -lprldap60 -lldif60
@enable_tests_TRUE@SASL_LINK = @sasl_lib@ -lsasl2
ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata $(LIBCSTD) $(LIBCRUN)