[Fedora-directory-commits] adminserver Makefile.am, 1.31, 1.32 Makefile.in, 1.36, 1.37 configure, 1.33, 1.34 configure.ac, 1.19, 1.20 ltmain.sh, 1.5, 1.6

Nathan Kinder (nkinder) fedora-directory-commits at redhat.com
Tue Aug 21 20:46:48 UTC 2007


Author: nkinder

Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19997

Modified Files:
	Makefile.am Makefile.in configure configure.ac ltmain.sh 
Log Message:
Resolves: 253760
Summary: Support FHS optional layout in Admin Server.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- Makefile.am	15 Aug 2007 22:08:13 -0000	1.31
+++ Makefile.am	21 Aug 2007 20:46:45 -0000	1.32
@@ -75,7 +75,6 @@
 securitydir = $(configdir)
 piddir = $(localstatedir)@piddir@
 pidfile = @pidfile@
-logdir = $(localstatedir)@logdir@/$(instancename)
 HTTPD = @HTTPD@
 httpduser = @httpduser@
 modnssbindir = @modnssbindir@
@@ -84,6 +83,11 @@
 infdir = $(datadir)@infdir@
 perldir = $(libdir)@perldir@
 dslibdir = @dslibdir@
+if BUNDLE
+logdir = $(localstatedir)@admlogdir@
+else
+logdir = $(localstatedir)@admlogdir@/$(instancename)
+endif
 
 libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
 	lib/base/system.cpp lib/base/nscputil.cpp
@@ -434,6 +438,59 @@
 # ADMConfigDir = ${prefix}/etc/packagename
 # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
 # ADMConfigDir = /etc/packagename
+if BUNDLE
+# Some of the paths need to be different if we are making a bundled build,
+# namely the mod_nss bindir.
+fixupcmd = sed \
+        -e 's, at ECHO_C\@,$(ECHO_C),g' \
+        -e 's, at ECHO_N\@,$(ECHO_N),g' \
+        -e 's, at HTTPD\@,$(HTTPD),g' \
+        -e 's, at bindir\@,$(bindir),g' \
+        -e 's, at sbindir\@,$(sbindir),g' \
+        -e 's, at localstatedir\@,$(localstatedir),g' \
+        -e 's, at cgibindir\@,$(cgibindir),g' \
+        -e 's, at cmdbindir\@,$(cmdbindir),g' \
+        -e 's, at moddir\@,$(moddir),g' \
+        -e 's, at modnssbindir\@,$(sbindir),g' \
+        -e 's, at propertydir\@,$(propertydir),g' \
+        -e 's, at htmldir\@,$(htmldir),g' \
+        -e 's, at icondir\@,$(icondir),g' \
+        -e 's, at logdir\@,$(logdir),g' \
+        -e 's, at manualdir\@,$(manualdir),g' \
+        -e 's, at configdir\@,$(configdir),g' \
+        -e 's, at securitydir\@,$(securitydir),g' \
+        -e 's, at httpduser\@,$(httpduser),g' \
+        -e 's, at httpdgroup\@,$(httpdgroup),g' \
+        -e 's, at httpdconfdir\@,$(httpdconfdir),g' \
+        -e 's, at piddir\@,$(piddir),g' \
+        -e 's, at pidfile\@,$(pidfile),g' \
+        -e 's, at admservport\@,$(admservport),g' \
+        -e 's, at LIBPATH\@,$(LIBPATH),g' \
+        -e 's, at nss_libdir\@,$(runtime_nss_libdir),g' \
+        -e 's, at ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
+        -e 's, at admmoddir\@,$(admmoddir),g' \
+        -e 's, at nssmoddir\@,$(runtime_nssmoddir),g' \
+        -e 's, at instconfigdir\@,$(instconfigdir),g' \
+        -e 's, at instancename\@,$(instancename),g' \
+        -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+        -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+        -e 's, at package_name\@,$(PACKAGE_NAME),g' \
+        -e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
+        -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+        -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
+        -e 's, at brand\@,$(brand),g' \
+        -e 's, at capbrand\@,$(capbrand),g' \
+        -e 's, at vendor\@,$(vendor),g' \
+        -e 's, at helpdir\@,$(helpdir),g' \
+        -e 's, at mimemagic\@,$(mimemagic),g' \
+        -e 's, at initdir\@,$(initdir),g' \
+        -e 's, at perlpath\@,$(perlpath),g' \
+        -e 's, at perlexec\@, at perlexec@,g' \
+        -e 's, at infdir\@,$(infdir),g' \
+        -e 's, at dslibdir\@,$(dslibdir),g' \
+        -e 's, at ldifdir\@,$(ldifdir),g' \
+        -e 's, at adminutilpath\@,$(adminutilpath),g'
+else
 fixupcmd = sed \
 	-e 's, at ECHO_C\@,$(ECHO_C),g' \
 	-e 's, at ECHO_N\@,$(ECHO_N),g' \
@@ -483,6 +540,7 @@
 	-e 's, at dslibdir\@,$(dslibdir),g' \
 	-e 's, at ldifdir\@,$(ldifdir),g' \
 	-e 's, at adminutilpath\@,$(adminutilpath),g'
+endif
 
 # because the source may be either httpd.conf.in or httpd-2.2.conf.in
 admserv/cfgstuff/httpd.conf: $(HTTPD_CONF_SRC)


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Makefile.in	17 Aug 2007 18:39:12 -0000	1.36
+++ Makefile.in	21 Aug 2007 20:46:45 -0000	1.37
@@ -417,6 +417,7 @@
 adminutil_lib = @adminutil_lib@
 adminutil_libdir = @adminutil_libdir@
 adminutil_ver = @adminutil_ver@
+admlogdir = @admlogdir@
 admmoddir = $(libdir)@admmoddir@
 admservport = @admservport@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -471,7 +472,6 @@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
-logdir = $(localstatedir)@logdir@/$(instancename)
 mandir = @mandir@
 manualdir = $(datadir)@manualdir@
 mimemagic = @mimemagic@
@@ -543,6 +543,8 @@
 configdir = $(instconfigdir)/$(instancename)
 # same as configdir for now
 securitydir = $(configdir)
+ at BUNDLE_FALSE@logdir = $(localstatedir)@admlogdir@/$(instancename)
+ at BUNDLE_TRUE@logdir = $(localstatedir)@admlogdir@
 libbase_a_SOURCES = lib/base/file.cpp lib/base/nscperror.c \
 	lib/base/system.cpp lib/base/nscputil.cpp
 
@@ -824,6 +826,56 @@
 	admserv/cgi-src40/ds_create.res \
 	admserv/cgi-src40/ds_remove.res
 
+ at BUNDLE_FALSE@fixupcmd = sed \
+ at BUNDLE_FALSE@	-e 's, at ECHO_C\@,$(ECHO_C),g' \
+ at BUNDLE_FALSE@	-e 's, at ECHO_N\@,$(ECHO_N),g' \
+ at BUNDLE_FALSE@	-e 's, at HTTPD\@,$(HTTPD),g' \
+ at BUNDLE_FALSE@	-e 's, at bindir\@,$(bindir),g' \
+ at BUNDLE_FALSE@	-e 's, at sbindir\@,$(sbindir),g' \
+ at BUNDLE_FALSE@	-e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_FALSE@	-e 's, at cgibindir\@,$(cgibindir),g' \
+ at BUNDLE_FALSE@	-e 's, at cmdbindir\@,$(cmdbindir),g' \
+ at BUNDLE_FALSE@	-e 's, at moddir\@,$(moddir),g' \
+ at BUNDLE_FALSE@	-e 's, at modnssbindir\@,$(modnssbindir),g' \
+ at BUNDLE_FALSE@	-e 's, at propertydir\@,$(propertydir),g' \
+ at BUNDLE_FALSE@	-e 's, at htmldir\@,$(htmldir),g' \
+ at BUNDLE_FALSE@	-e 's, at icondir\@,$(icondir),g' \
+ at BUNDLE_FALSE@	-e 's, at logdir\@,$(logdir),g' \
+ at BUNDLE_FALSE@	-e 's, at manualdir\@,$(manualdir),g' \
+ at BUNDLE_FALSE@	-e 's, at configdir\@,$(configdir),g' \
+ at BUNDLE_FALSE@	-e 's, at securitydir\@,$(securitydir),g' \
+ at BUNDLE_FALSE@	-e 's, at httpduser\@,$(httpduser),g' \
+ at BUNDLE_FALSE@	-e 's, at httpdgroup\@,$(httpdgroup),g' \
+ at BUNDLE_FALSE@	-e 's, at httpdconfdir\@,$(httpdconfdir),g' \
+ at BUNDLE_FALSE@	-e 's, at piddir\@,$(piddir),g' \
+ at BUNDLE_FALSE@	-e 's, at pidfile\@,$(pidfile),g' \
+ at BUNDLE_FALSE@	-e 's, at admservport\@,$(admservport),g' \
+ at BUNDLE_FALSE@	-e 's, at LIBPATH\@,$(LIBPATH),g' \
+ at BUNDLE_FALSE@	-e 's, at nss_libdir\@,$(runtime_nss_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
+ at BUNDLE_FALSE@	-e 's, at admmoddir\@,$(admmoddir),g' \
+ at BUNDLE_FALSE@	-e 's, at nssmoddir\@,$(runtime_nssmoddir),g' \
+ at BUNDLE_FALSE@	-e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_FALSE@	-e 's, at instancename\@,$(instancename),g' \
+ at BUNDLE_FALSE@	-e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+ at BUNDLE_FALSE@	-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ at BUNDLE_FALSE@	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
+ at BUNDLE_FALSE@	-e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
+ at BUNDLE_FALSE@	-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ at BUNDLE_FALSE@	-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
+ at BUNDLE_FALSE@	-e 's, at brand\@,$(brand),g' \
+ at BUNDLE_FALSE@	-e 's, at capbrand\@,$(capbrand),g' \
+ at BUNDLE_FALSE@	-e 's, at vendor\@,$(vendor),g' \
+ at BUNDLE_FALSE@	-e 's, at helpdir\@,$(helpdir),g' \
+ at BUNDLE_FALSE@	-e 's, at mimemagic\@,$(mimemagic),g' \
+ at BUNDLE_FALSE@	-e 's, at initdir\@,$(initdir),g' \
+ at BUNDLE_FALSE@	-e 's, at perlpath\@,$(perlpath),g' \
+ at BUNDLE_FALSE@	-e 's, at perlexec\@, at perlexec@,g' \
+ at BUNDLE_FALSE@	-e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_FALSE@	-e 's, at dslibdir\@,$(dslibdir),g' \
+ at BUNDLE_FALSE@	-e 's, at ldifdir\@,$(ldifdir),g' \
+ at BUNDLE_FALSE@	-e 's, at adminutilpath\@,$(adminutilpath),g'
+
 
 # these are for the config files and scripts that we need to generate and replace
 # the paths and other tokens with the real values set during configure/make
@@ -831,55 +883,57 @@
 # ADMConfigDir = ${prefix}/etc/packagename
 # i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
 # ADMConfigDir = /etc/packagename
-fixupcmd = sed \
-	-e 's, at ECHO_C\@,$(ECHO_C),g' \
-	-e 's, at ECHO_N\@,$(ECHO_N),g' \
-	-e 's, at HTTPD\@,$(HTTPD),g' \
-	-e 's, at bindir\@,$(bindir),g' \
-	-e 's, at sbindir\@,$(sbindir),g' \
-	-e 's, at localstatedir\@,$(localstatedir),g' \
-	-e 's, at cgibindir\@,$(cgibindir),g' \
-	-e 's, at cmdbindir\@,$(cmdbindir),g' \
-	-e 's, at moddir\@,$(moddir),g' \
-	-e 's, at modnssbindir\@,$(modnssbindir),g' \
-	-e 's, at propertydir\@,$(propertydir),g' \
-	-e 's, at htmldir\@,$(htmldir),g' \
-	-e 's, at icondir\@,$(icondir),g' \
-	-e 's, at logdir\@,$(logdir),g' \
-	-e 's, at manualdir\@,$(manualdir),g' \
-	-e 's, at configdir\@,$(configdir),g' \
-	-e 's, at securitydir\@,$(securitydir),g' \
-	-e 's, at httpduser\@,$(httpduser),g' \
-	-e 's, at httpdgroup\@,$(httpdgroup),g' \
-	-e 's, at httpdconfdir\@,$(httpdconfdir),g' \
-	-e 's, at piddir\@,$(piddir),g' \
-	-e 's, at pidfile\@,$(pidfile),g' \
-	-e 's, at admservport\@,$(admservport),g' \
-	-e 's, at LIBPATH\@,$(LIBPATH),g' \
-	-e 's, at nss_libdir\@,$(runtime_nss_libdir),g' \
-	-e 's, at ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
-	-e 's, at admmoddir\@,$(admmoddir),g' \
-	-e 's, at nssmoddir\@,$(runtime_nssmoddir),g' \
-	-e 's, at instconfigdir\@,$(instconfigdir),g' \
-	-e 's, at instancename\@,$(instancename),g' \
-	-e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
-	-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
-	-e 's, at package_name\@,$(PACKAGE_NAME),g' \
-	-e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
-	-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-	-e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
-	-e 's, at brand\@,$(brand),g' \
-	-e 's, at capbrand\@,$(capbrand),g' \
-	-e 's, at vendor\@,$(vendor),g' \
-	-e 's, at helpdir\@,$(helpdir),g' \
-	-e 's, at mimemagic\@,$(mimemagic),g' \
-	-e 's, at initdir\@,$(initdir),g' \
-	-e 's, at perlpath\@,$(perlpath),g' \
-	-e 's, at perlexec\@, at perlexec@,g' \
-	-e 's, at infdir\@,$(infdir),g' \
-	-e 's, at dslibdir\@,$(dslibdir),g' \
-	-e 's, at ldifdir\@,$(ldifdir),g' \
-	-e 's, at adminutilpath\@,$(adminutilpath),g'
+# Some of the paths need to be different if we are making a bundled build,
+# namely the mod_nss bindir.
+ at BUNDLE_TRUE@fixupcmd = sed \
+ at BUNDLE_TRUE@        -e 's, at ECHO_C\@,$(ECHO_C),g' \
+ at BUNDLE_TRUE@        -e 's, at ECHO_N\@,$(ECHO_N),g' \
+ at BUNDLE_TRUE@        -e 's, at HTTPD\@,$(HTTPD),g' \
+ at BUNDLE_TRUE@        -e 's, at bindir\@,$(bindir),g' \
+ at BUNDLE_TRUE@        -e 's, at sbindir\@,$(sbindir),g' \
+ at BUNDLE_TRUE@        -e 's, at localstatedir\@,$(localstatedir),g' \
+ at BUNDLE_TRUE@        -e 's, at cgibindir\@,$(cgibindir),g' \
+ at BUNDLE_TRUE@        -e 's, at cmdbindir\@,$(cmdbindir),g' \
+ at BUNDLE_TRUE@        -e 's, at moddir\@,$(moddir),g' \
+ at BUNDLE_TRUE@        -e 's, at modnssbindir\@,$(sbindir),g' \
+ at BUNDLE_TRUE@        -e 's, at propertydir\@,$(propertydir),g' \
+ at BUNDLE_TRUE@        -e 's, at htmldir\@,$(htmldir),g' \
+ at BUNDLE_TRUE@        -e 's, at icondir\@,$(icondir),g' \
+ at BUNDLE_TRUE@        -e 's, at logdir\@,$(logdir),g' \
+ at BUNDLE_TRUE@        -e 's, at manualdir\@,$(manualdir),g' \
+ at BUNDLE_TRUE@        -e 's, at configdir\@,$(configdir),g' \
+ at BUNDLE_TRUE@        -e 's, at securitydir\@,$(securitydir),g' \
+ at BUNDLE_TRUE@        -e 's, at httpduser\@,$(httpduser),g' \
+ at BUNDLE_TRUE@        -e 's, at httpdgroup\@,$(httpdgroup),g' \
+ at BUNDLE_TRUE@        -e 's, at httpdconfdir\@,$(httpdconfdir),g' \
+ at BUNDLE_TRUE@        -e 's, at piddir\@,$(piddir),g' \
+ at BUNDLE_TRUE@        -e 's, at pidfile\@,$(pidfile),g' \
+ at BUNDLE_TRUE@        -e 's, at admservport\@,$(admservport),g' \
+ at BUNDLE_TRUE@        -e 's, at LIBPATH\@,$(LIBPATH),g' \
+ at BUNDLE_TRUE@        -e 's, at nss_libdir\@,$(runtime_nss_libdir),g' \
+ at BUNDLE_TRUE@        -e 's, at ldapsdk_libdir\@,$(runtime_ldapsdk_libdir),g' \
+ at BUNDLE_TRUE@        -e 's, at admmoddir\@,$(admmoddir),g' \
+ at BUNDLE_TRUE@        -e 's, at nssmoddir\@,$(runtime_nssmoddir),g' \
+ at BUNDLE_TRUE@        -e 's, at instconfigdir\@,$(instconfigdir),g' \
+ at BUNDLE_TRUE@        -e 's, at instancename\@,$(instancename),g' \
+ at BUNDLE_TRUE@        -e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
+ at BUNDLE_TRUE@        -e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ at BUNDLE_TRUE@        -e 's, at package_name\@,$(PACKAGE_NAME),g' \
+ at BUNDLE_TRUE@        -e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
+ at BUNDLE_TRUE@        -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
+ at BUNDLE_TRUE@        -e 's, at PACKAGE_BASE_VERSION\@,$(PACKAGE_BASE_VERSION),g' \
+ at BUNDLE_TRUE@        -e 's, at brand\@,$(brand),g' \
+ at BUNDLE_TRUE@        -e 's, at capbrand\@,$(capbrand),g' \
+ at BUNDLE_TRUE@        -e 's, at vendor\@,$(vendor),g' \
+ at BUNDLE_TRUE@        -e 's, at helpdir\@,$(helpdir),g' \
+ at BUNDLE_TRUE@        -e 's, at mimemagic\@,$(mimemagic),g' \
+ at BUNDLE_TRUE@        -e 's, at initdir\@,$(initdir),g' \
+ at BUNDLE_TRUE@        -e 's, at perlpath\@,$(perlpath),g' \
+ at BUNDLE_TRUE@        -e 's, at perlexec\@, at perlexec@,g' \
+ at BUNDLE_TRUE@        -e 's, at infdir\@,$(infdir),g' \
+ at BUNDLE_TRUE@        -e 's, at dslibdir\@,$(dslibdir),g' \
+ at BUNDLE_TRUE@        -e 's, at ldifdir\@,$(ldifdir),g' \
+ at BUNDLE_TRUE@        -e 's, at adminutilpath\@,$(adminutilpath),g'
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive


Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- configure	17 Aug 2007 18:39:12 -0000	1.33
+++ configure	21 Aug 2007 20:46:45 -0000	1.34
@@ -468,7 +468,7 @@
 ac_default_prefix=/opt/dirsrv
 ac_subdirs_all="$ac_subdirs_all mod_admserv"
 ac_subdirs_all="$ac_subdirs_all mod_restartd"
-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 CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE 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 CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
 P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir mimemagic httpduser httpdgroup admlogdir piddir pidfile admservport ldifdir admmoddir nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE MOD_RESTARTD_FALSE LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -23013,39 +23013,6 @@
 fi
 
 
-# installation paths - by default, configure will just
-# use /usr as the prefix for everything, which means
-# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
-# The with-fhs-opt option will use the
-# prefix, but it's sysconfdir and localstatedir will be
-# /etc/opt, and /var/opt.
-if test "$with_fhs_opt" = "yes"; then
-  # Override sysconfdir and localstatedir if FHS optional
-  # package was requested.
-  sysconfdir='/etc/opt'
-  localstatedir='/var/opt'
-  # relative to datadir
-  infdir=/inf
-  htmldir=/html
-  icondir=/icons
-  manualdir=/manual
-  ldifdir=/data
-else
-  if test "$with_fhs" = "yes"; then
-    ac_default_prefix=/usr
-    prefix=$ac_default_prefix
-    exec_prefix=$prefix
-        sysconfdir='/etc'
-        localstatedir='/var'
-  fi
-# relative to datadir
-  infdir=/$PACKAGE_BASE_NAME/inf
-  htmldir=/$PACKAGE_BASE_NAME/html
-  icondir=/$PACKAGE_BASE_NAME/icons
-  manualdir=/$PACKAGE_BASE_NAME/manual
-  ldifdir=/$PACKAGE_BASE_NAME/data
-fi
-
 # server userid, groupid
 httpduser=nobody
 httpdgroup=nobody
@@ -24949,26 +24916,64 @@
 fi;
 
 
-# CGI program directory, relative to libdir
-cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
-
-# cmdbindir is just sbindir
-#cmdbindir=$libdir/$PKGNAME
+# installation paths - by default, configure will just
+# use /usr as the prefix for everything, which means
+# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
+# The with-fhs-opt option will use the
+# prefix, but it's sysconfdir and localstatedir will be
+# /etc/opt, and /var/opt.
+if test "$with_fhs_opt" = "yes"; then
+  # Override sysconfdir and localstatedir if FHS optional
+  # package was requested.
+  sysconfdir='/etc/opt'
+  localstatedir='/var/opt'
+  # relative to datadir
+  infdir=/inf
+  htmldir=/html
+  icondir=/icons
+  manualdir=/manual
+  ldifdir=/data
+  # relative to libdir
+  # CGI program directory
+  cgibindir=/cgi-bin
+  # where our private Apache modules will go
+  admmoddir=/modules
+  perldir=/perl
+  # log files, relative to localstatedir
+  admlogdir=/$PACKAGE_BASE_NAME/$instancename/log
+  # the pid dir, relative to localstatedir
+  piddir=/$PACKAGE_BASE_NAME/$instancename/run
+  # location of property/resource files, relative to datadir
+  propertydir=/properties
+else
+  if test "$with_fhs" = "yes"; then
+    ac_default_prefix=/usr
+    prefix=$ac_default_prefix
+    exec_prefix=$prefix
+        sysconfdir='/etc'
+        localstatedir='/var'
+  fi
+  # relative to datadir
+  infdir=/$PACKAGE_BASE_NAME/inf
+  htmldir=/$PACKAGE_BASE_NAME/html
+  icondir=/$PACKAGE_BASE_NAME/icons
+  manualdir=/$PACKAGE_BASE_NAME/manual
+  ldifdir=/$PACKAGE_BASE_NAME/data
+  # relative to libdir
+  # CGI program directory
+  cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+  # where our private Apache modules will go
+  admmoddir=/$PACKAGE_BASE_NAME/modules
+  perldir=/$PACKAGE_BASE_NAME/perl
+  # log files, relative to localstatedir
+  admlogdir=/log/$PACKAGE_BASE_NAME
+  # the pid dir, relative to localstatedir
+  piddir=/run/$PACKAGE_BASE_NAME
+  # location of property/resource files, relative to datadir
+  propertydir=/$PACKAGE_BASE_NAME/properties
+fi
 
-# log files, relative to localstatedir
-logdir=/log/$PACKAGE_BASE_NAME
-# the pid dir, relative to localstatedir
-piddir=/run/$PACKAGE_BASE_NAME
 pidfile=$instancename.pid
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_BASE_NAME/properties
-
-# where our private Apache modules will go
-# relative to libdir
-admmoddir=/$PACKAGE_BASE_NAME/modules
-
-# relative to libdir
-perldir=/$PACKAGE_BASE_NAME/perl
 
 # write out paths for binary components
 
@@ -25948,7 +25953,7 @@
 s, at mimemagic@,$mimemagic,;t t
 s, at httpduser@,$httpduser,;t t
 s, at httpdgroup@,$httpdgroup,;t t
-s, at logdir@,$logdir,;t t
+s, at admlogdir@,$admlogdir,;t t
 s, at piddir@,$piddir,;t t
 s, at pidfile@,$pidfile,;t t
 s, at admservport@,$admservport,;t t


Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- configure.ac	17 Aug 2007 18:39:12 -0000	1.19
+++ configure.ac	21 Aug 2007 20:46:45 -0000	1.20
@@ -92,41 +92,6 @@
 
 m4_include(m4/fhs.m4)
 
-# installation paths - by default, configure will just
-# use /usr as the prefix for everything, which means
-# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
-# The with-fhs-opt option will use the
-# prefix, but it's sysconfdir and localstatedir will be
-# /etc/opt, and /var/opt.
-if test "$with_fhs_opt" = "yes"; then
-  # Override sysconfdir and localstatedir if FHS optional
-  # package was requested.
-  sysconfdir='/etc/opt'
-  localstatedir='/var/opt'
-  # relative to datadir
-  infdir=/inf
-  htmldir=/html
-  icondir=/icons
-  manualdir=/manual
-  ldifdir=/data
-else
-  if test "$with_fhs" = "yes"; then
-    ac_default_prefix=/usr
-    prefix=$ac_default_prefix
-    exec_prefix=$prefix
-    dnl as opposed to the default /usr/etc
-    sysconfdir='/etc'
-    dnl as opposed to the default /usr/var
-    localstatedir='/var'
-  fi
-# relative to datadir
-  infdir=/$PACKAGE_BASE_NAME/inf
-  htmldir=/$PACKAGE_BASE_NAME/html
-  icondir=/$PACKAGE_BASE_NAME/icons
-  manualdir=/$PACKAGE_BASE_NAME/manual
-  ldifdir=/$PACKAGE_BASE_NAME/data
-fi
-
 # server userid, groupid
 httpduser=nobody
 httpdgroup=nobody
@@ -271,26 +236,66 @@
 ])
 AC_SUBST(dslibdir)
 
-# CGI program directory, relative to libdir
-cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
-
-# cmdbindir is just sbindir
-#cmdbindir=$libdir/$PKGNAME
+# installation paths - by default, configure will just
+# use /usr as the prefix for everything, which means
+# /usr/etc and /usr/var.  FHS sez to use /etc and /var.
+# The with-fhs-opt option will use the
+# prefix, but it's sysconfdir and localstatedir will be
+# /etc/opt, and /var/opt.
+if test "$with_fhs_opt" = "yes"; then
+  # Override sysconfdir and localstatedir if FHS optional
+  # package was requested.
+  sysconfdir='/etc/opt'
+  localstatedir='/var/opt'
+  # relative to datadir
+  infdir=/inf
+  htmldir=/html
+  icondir=/icons
+  manualdir=/manual
+  ldifdir=/data
+  # relative to libdir
+  # CGI program directory
+  cgibindir=/cgi-bin
+  # where our private Apache modules will go
+  admmoddir=/modules
+  perldir=/perl
+  # log files, relative to localstatedir
+  admlogdir=/$PACKAGE_BASE_NAME/$instancename/log
+  # the pid dir, relative to localstatedir
+  piddir=/$PACKAGE_BASE_NAME/$instancename/run
+  # location of property/resource files, relative to datadir
+  propertydir=/properties
+else
+  if test "$with_fhs" = "yes"; then
+    ac_default_prefix=/usr
+    prefix=$ac_default_prefix
+    exec_prefix=$prefix
+    dnl as opposed to the default /usr/etc
+    sysconfdir='/etc'
+    dnl as opposed to the default /usr/var
+    localstatedir='/var'
+  fi
+  # relative to datadir
+  infdir=/$PACKAGE_BASE_NAME/inf
+  htmldir=/$PACKAGE_BASE_NAME/html
+  icondir=/$PACKAGE_BASE_NAME/icons
+  manualdir=/$PACKAGE_BASE_NAME/manual
+  ldifdir=/$PACKAGE_BASE_NAME/data
+  # relative to libdir
+  # CGI program directory
+  cgibindir=/$PACKAGE_BASE_NAME/cgi-bin
+  # where our private Apache modules will go
+  admmoddir=/$PACKAGE_BASE_NAME/modules
+  perldir=/$PACKAGE_BASE_NAME/perl
+  # log files, relative to localstatedir
+  admlogdir=/log/$PACKAGE_BASE_NAME
+  # the pid dir, relative to localstatedir
+  piddir=/run/$PACKAGE_BASE_NAME
+  # location of property/resource files, relative to datadir
+  propertydir=/$PACKAGE_BASE_NAME/properties
+fi
 
-# log files, relative to localstatedir
-logdir=/log/$PACKAGE_BASE_NAME
-# the pid dir, relative to localstatedir
-piddir=/run/$PACKAGE_BASE_NAME
 pidfile=$instancename.pid
-# location of property/resource files, relative to datadir
-propertydir=/$PACKAGE_BASE_NAME/properties
-
-# where our private Apache modules will go
-# relative to libdir
-admmoddir=/$PACKAGE_BASE_NAME/modules
-
-# relative to libdir
-perldir=/$PACKAGE_BASE_NAME/perl
 
 # write out paths for binary components
 AC_SUBST(PACKAGE_NAME)
@@ -331,7 +336,7 @@
 AC_SUBST(mimemagic)
 AC_SUBST(httpduser)
 AC_SUBST(httpdgroup)
-AC_SUBST(logdir)
+AC_SUBST(admlogdir)
 AC_SUBST(piddir)
 AC_SUBST(pidfile)
 AC_SUBST(admservport)


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/adminserver/ltmain.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ltmain.sh	27 Jun 2007 18:32:46 -0000	1.5
+++ ltmain.sh	21 Aug 2007 20:46:45 -0000	1.6
@@ -46,10 +46,16 @@
 VERSION=1.5.22
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
 
 # Check that we have a working $echo.
@@ -105,12 +111,14 @@
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+         save_$lt_var=\$$lt_var
+         $lt_var=C
+         export $lt_var
+       fi"
+done
 
 # Make sure IFS has a sensible default
 lt_nl='
@@ -136,6 +144,8 @@
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -327,7 +337,17 @@
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+       *" $my_xlib_u "*)
+         extracted_serial=`expr $extracted_serial + 1`
+         my_xlib_u=lt$extracted_serial-$my_xlib ;;
+       *) break ;;
+       esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
     *.f90) xform=f90 ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+    case $arg in
+    -all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1169,20 @@
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+    -static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+    -static-libtool-libs)
+      if test -z "$pic_flag" && test -n "$link_static_flag"; then
+        dlopen_self=$dlopen_self_static
+      fi
+      prefer_static_libs=yes
+      ;;
+    esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1712,7 +1742,7 @@
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+         { { test "$prefer_static_libs" = no ||
+             test "$prefer_static_libs,$installed" = "built,yes"; } ||
+           test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3410,11 +3442,11 @@
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+#      for path in $notinst_path; do
+#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+#      done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3560,9 +3591,7 @@
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -4239,12 +4268,14 @@
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+      reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4716,13 +4747,13 @@
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4846,7 +4877,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5581,7 +5624,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5926,9 +5969,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+       eval "if test \"\${save_$lt_var+set}\" = set; then
+               $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
+             fi"
+      done
+
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6791,9 +6837,11 @@
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 




More information about the Fedora-directory-commits mailing list