Author: nhosoi
Update of /cvs/dirsec/adminserver In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8193
Modified Files: Makefile.am Makefile.in aclocal.m4 configure Log Message: Resolves: #247215 Summary: Reimplement ds_remove without setuputil code (comment #7) Description: adding Perl version of ds_remove
Index: Makefile.am =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.am,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile.am 4 Jul 2007 01:31:32 -0000 1.22 +++ Makefile.am 11 Jul 2007 01:20:21 -0000 1.23 @@ -136,6 +136,7 @@ admserv/schema/ldif/01nsroot.ldif.tmpl \ admserv/schema/ldif/02globalpreferences.ldif.tmpl \ admserv/schema/ldif/10dsdata.ldif.tmpl \ + admserv/schema/ldif/10rm_dsdata.ldif.tmpl \ admserv/schema/ldif/11dstasks.ldif.tmpl \ admserv/schema/ldif/12dsconfig.mod.tmpl \ admserv/schema/ldif/13dsschema.mod.tmpl \ @@ -158,10 +159,10 @@ config statpingserv viewdata dsconfig monreplication restartsrv \ statusping viewlog htmladmin sec-activate stopsrv download help \ ds_start ds_restart ds_shutdown ds_ldif2db ds_db2ldif ds_bak2db \ - ds_db2bak ds_listdb ds_rmdb ds_remove ds_snmpctrl ds_vlvindex ds_addindex + ds_db2bak ds_listdb ds_rmdb ds_snmpctrl ds_vlvindex ds_addindex
bin_SCRIPTS = admserv/newinst/src/register_server.pl -cgibin_SCRIPTS = admserv/cgi-src40/ds_create +cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \ @@ -294,11 +295,6 @@ ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS) ds_rmdb_LINK = $(MYLINK)
-ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c -ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS) -ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS) -ds_remove_LINK = $(MYLINK) - ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS) ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS) @@ -374,7 +370,8 @@ # regular property files go here property_DATA = admserv/newinst/src/setup-ds-admin.res \ admserv/newinst/src/migrate-ds-admin.res \ - admserv/cgi-src40/ds_create.res + admserv/cgi-src40/ds_create.res \ + admserv/cgi-src40/ds_remove.res
# French resource bundles (for the French localization in the future) #RESOURCE_BUNDLES_FR = foo_fr.res
Index: Makefile.in =================================================================== RCS file: /cvs/dirsec/adminserver/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Makefile.in 4 Jul 2007 01:31:32 -0000 1.22 +++ Makefile.in 11 Jul 2007 01:20:21 -0000 1.23 @@ -51,8 +51,8 @@ help$(EXEEXT) ds_start$(EXEEXT) ds_restart$(EXEEXT) \ ds_shutdown$(EXEEXT) ds_ldif2db$(EXEEXT) ds_db2ldif$(EXEEXT) \ ds_bak2db$(EXEEXT) ds_db2bak$(EXEEXT) ds_listdb$(EXEEXT) \ - ds_rmdb$(EXEEXT) ds_remove$(EXEEXT) ds_snmpctrl$(EXEEXT) \ - ds_vlvindex$(EXEEXT) ds_addindex$(EXEEXT) + ds_rmdb$(EXEEXT) ds_snmpctrl$(EXEEXT) ds_vlvindex$(EXEEXT) \ + ds_addindex$(EXEEXT) DIST_COMMON = README $(am__configure_deps) $(dist_help_DATA) \ $(dist_html_DATA) $(dist_icon_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ @@ -167,10 +167,6 @@ admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT) ds_listdb_OBJECTS = $(am_ds_listdb_OBJECTS) ds_listdb_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2) -am_ds_remove_OBJECTS = admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT) \ - admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT) -ds_remove_OBJECTS = $(am_ds_remove_OBJECTS) -ds_remove_DEPENDENCIES = libdsa.a $(am__DEPENDENCIES_2) am_ds_restart_OBJECTS = admserv/cgi-ds/ds_restart-restart.$(OBJEXT) \ admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT) ds_restart_OBJECTS = $(am_ds_restart_OBJECTS) @@ -274,8 +270,7 @@ $(download_SOURCES) $(ds_addindex_SOURCES) \ $(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \ $(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \ - $(ds_listdb_SOURCES) $(ds_remove_SOURCES) \ - $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \ + $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \ $(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \ $(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \ $(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \ @@ -289,8 +284,7 @@ $(download_SOURCES) $(ds_addindex_SOURCES) \ $(ds_bak2db_SOURCES) $(ds_db2bak_SOURCES) \ $(ds_db2ldif_SOURCES) $(ds_ldif2db_SOURCES) \ - $(ds_listdb_SOURCES) $(ds_remove_SOURCES) \ - $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \ + $(ds_listdb_SOURCES) $(ds_restart_SOURCES) $(ds_rmdb_SOURCES) \ $(ds_shutdown_SOURCES) $(ds_snmpctrl_SOURCES) \ $(ds_start_SOURCES) $(ds_vlvindex_SOURCES) $(dsconfig_SOURCES) \ $(help_SOURCES) $(htmladmin_SOURCES) $(monreplication_SOURCES) \ @@ -401,7 +395,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ RANLIB = @RANLIB@ -SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -576,6 +569,7 @@ admserv/schema/ldif/01nsroot.ldif.tmpl \ admserv/schema/ldif/02globalpreferences.ldif.tmpl \ admserv/schema/ldif/10dsdata.ldif.tmpl \ + admserv/schema/ldif/10rm_dsdata.ldif.tmpl \ admserv/schema/ldif/11dstasks.ldif.tmpl \ admserv/schema/ldif/12dsconfig.mod.tmpl \ admserv/schema/ldif/13dsschema.mod.tmpl \ @@ -595,7 +589,7 @@ admserv/newinst/src/asmigrate.map
bin_SCRIPTS = admserv/newinst/src/register_server.pl -cgibin_SCRIPTS = admserv/cgi-src40/ds_create +cgibin_SCRIPTS = admserv/cgi-src40/ds_create admserv/cgi-src40/ds_remove nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin cmdbin_SCRIPTS = admserv/newinst/src/setup-ds-admin.pl \ admserv/newinst/src/migrate-ds-admin.pl @@ -715,10 +709,6 @@ ds_rmdb_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS) ds_rmdb_LDADD = libdsa.a $(DEFAULT_LIBS) ds_rmdb_LINK = $(MYLINK) -ds_remove_SOURCES = admserv/cgi-ds/ds_remove.c admserv/cgi-ds/init_ds_env.c -ds_remove_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS) -ds_remove_LDADD = libdsa.a $(DEFAULT_LIBS) -ds_remove_LINK = $(MYLINK) ds_snmpctrl_SOURCES = admserv/cgi-ds/ds_snmpctrl.c admserv/cgi-ds/init_ds_env.c ds_snmpctrl_CPPFLAGS = -I$(srcdir)/include/libdsa $(AM_CPPFLAGS) ds_snmpctrl_LDADD = libdsa.a $(DEFAULT_LIBS) @@ -785,7 +775,8 @@ # regular property files go here property_DATA = admserv/newinst/src/setup-ds-admin.res \ admserv/newinst/src/migrate-ds-admin.res \ - admserv/cgi-src40/ds_create.res + admserv/cgi-src40/ds_create.res \ + admserv/cgi-src40/ds_remove.res
# these are for the config files and scripts that we need to generate and replace @@ -1144,15 +1135,6 @@ ds_listdb$(EXEEXT): $(ds_listdb_OBJECTS) $(ds_listdb_DEPENDENCIES) @rm -f ds_listdb$(EXEEXT) $(ds_listdb_LINK) $(ds_listdb_LDFLAGS) $(ds_listdb_OBJECTS) $(ds_listdb_LDADD) $(LIBS) -admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT): \ - admserv/cgi-ds/$(am__dirstamp) \ - admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp) -admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT): \ - admserv/cgi-ds/$(am__dirstamp) \ - admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp) -ds_remove$(EXEEXT): $(ds_remove_OBJECTS) $(ds_remove_DEPENDENCIES) - @rm -f ds_remove$(EXEEXT) - $(ds_remove_LINK) $(ds_remove_LDFLAGS) $(ds_remove_OBJECTS) $(ds_remove_LDADD) $(LIBS) admserv/cgi-ds/ds_restart-restart.$(OBJEXT): \ admserv/cgi-ds/$(am__dirstamp) \ admserv/cgi-ds/$(DEPDIR)/$(am__dirstamp) @@ -1419,8 +1401,6 @@ -rm -f admserv/cgi-ds/ds_ldif2db-init_ds_env.$(OBJEXT) -rm -f admserv/cgi-ds/ds_listdb-ds_listdb.$(OBJEXT) -rm -f admserv/cgi-ds/ds_listdb-init_ds_env.$(OBJEXT) - -rm -f admserv/cgi-ds/ds_remove-ds_remove.$(OBJEXT) - -rm -f admserv/cgi-ds/ds_remove-init_ds_env.$(OBJEXT) -rm -f admserv/cgi-ds/ds_restart-init_ds_env.$(OBJEXT) -rm -f admserv/cgi-ds/ds_restart-restart.$(OBJEXT) -rm -f admserv/cgi-ds/ds_rmdb-ds_rmdb.$(OBJEXT) @@ -1517,8 +1497,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_ldif2db-init_ds_env.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_listdb-ds_listdb.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_listdb-init_ds_env.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_restart-init_ds_env.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@admserv/cgi-ds/$(DEPDIR)/ds_rmdb-ds_rmdb.Po@am__quote@ @@ -1941,34 +1919,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_listdb_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_listdb-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`
-admserv/cgi-ds/ds_remove-ds_remove.o: admserv/cgi-ds/ds_remove.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-ds_remove.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" -c -o admserv/cgi-ds/ds_remove-ds_remove.o `test -f 'admserv/cgi-ds/ds_remove.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_remove.c; \ -@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_remove.c' object='admserv/cgi-ds/ds_remove-ds_remove.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-ds_remove.o `test -f 'admserv/cgi-ds/ds_remove.c' || echo '$(srcdir)/'`admserv/cgi-ds/ds_remove.c - -admserv/cgi-ds/ds_remove-ds_remove.obj: admserv/cgi-ds/ds_remove.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-ds_remove.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" -c -o admserv/cgi-ds/ds_remove-ds_remove.obj `if test -f 'admserv/cgi-ds/ds_remove.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_remove.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_remove.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-ds_remove.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/ds_remove.c' object='admserv/cgi-ds/ds_remove-ds_remove.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-ds_remove.obj `if test -f 'admserv/cgi-ds/ds_remove.c'; then $(CYGPATH_W) 'admserv/cgi-ds/ds_remove.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/ds_remove.c'; fi` - -admserv/cgi-ds/ds_remove-init_ds_env.o: admserv/cgi-ds/init_ds_env.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-init_ds_env.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_remove-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c; \ -@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_remove-init_ds_env.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-init_ds_env.o `test -f 'admserv/cgi-ds/init_ds_env.c' || echo '$(srcdir)/'`admserv/cgi-ds/init_ds_env.c - -admserv/cgi-ds/ds_remove-init_ds_env.obj: admserv/cgi-ds/init_ds_env.c -@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_remove-init_ds_env.obj -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" -c -o admserv/cgi-ds/ds_remove-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_remove-init_ds_env.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='admserv/cgi-ds/init_ds_env.c' object='admserv/cgi-ds/ds_remove-init_ds_env.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_remove_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o admserv/cgi-ds/ds_remove-init_ds_env.obj `if test -f 'admserv/cgi-ds/init_ds_env.c'; then $(CYGPATH_W) 'admserv/cgi-ds/init_ds_env.c'; else $(CYGPATH_W) '$(srcdir)/admserv/cgi-ds/init_ds_env.c'; fi` - admserv/cgi-ds/ds_restart-restart.o: admserv/cgi-ds/restart.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ds_restart_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT admserv/cgi-ds/ds_restart-restart.o -MD -MP -MF "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo" -c -o admserv/cgi-ds/ds_restart-restart.o `test -f 'admserv/cgi-ds/restart.c' || echo '$(srcdir)/'`admserv/cgi-ds/restart.c; \ @am__fastdepCC_TRUE@ then mv -f "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo" "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Po"; else rm -f "admserv/cgi-ds/$(DEPDIR)/ds_restart-restart.Tpo"; exit 1; fi
Index: aclocal.m4 =================================================================== RCS file: /cvs/dirsec/adminserver/aclocal.m4,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- aclocal.m4 4 Jul 2007 01:31:32 -0000 1.17 +++ aclocal.m4 11 Jul 2007 01:20:21 -0000 1.18 @@ -1578,27 +1578,10 @@ # before this can be enabled. hardcode_into_libs=yes
- # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", [$]2)); skip = 1; } { if (!skip) print [$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", [$]2)); skip = 1; } { if (!skip) print [$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi
# We used to test for /lib/ld.so.1 and disable shared libraries on @@ -4305,9 +4288,6 @@ # Is the compiler the GNU C compiler? with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'` -gcc_ver=`gcc -dumpversion` - # An ERE matcher. EGREP=$lt_EGREP
@@ -4441,11 +4421,11 @@
# Dependencies to place before the objects being linked to create a # shared library. -predep_objects=`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a # shared library. @@ -4457,7 +4437,7 @@
# The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -4537,7 +4517,7 @@ link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries -sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -6373,7 +6353,6 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6406,7 +6385,6 @@ done ]) SED=$lt_cv_path_SED -AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ])
Index: configure =================================================================== RCS file: /cvs/dirsec/adminserver/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- configure 4 Jul 2007 01:31:32 -0000 1.20 +++ configure 11 Jul 2007 01:20:21 -0000 1.21 @@ -468,7 +468,7 @@ ac_default_prefix=/opt/fedora-ds 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 LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf 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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX! XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf 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_files=''
# Initialize some variables set by options. @@ -3832,7 +3832,6 @@ done done done -IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -3867,7 +3866,6 @@ fi
SED=$lt_cv_path_SED - echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6
@@ -4308,7 +4306,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4311 "configure"' > conftest.$ac_ext + echo '#line 4309 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5443,7 +5441,7 @@
# Provide some information about the compiler. -echo "$as_me:5446:" \ +echo "$as_me:5444:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: "$ac_compiler --version </dev/null >&5"") >&5 @@ -6506,11 +6504,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:6509: $lt_compile"" >&5) + (eval echo ""$as_me:6507: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6513: $? = $ac_status" >&5 + echo "$as_me:6511: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6774,11 +6772,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:6777: $lt_compile"" >&5) + (eval echo ""$as_me:6775: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6781: $? = $ac_status" >&5 + echo "$as_me:6779: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6878,11 +6876,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:6881: $lt_compile"" >&5) + (eval echo ""$as_me:6879: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6885: $? = $ac_status" >&5 + echo "$as_me:6883: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8343,31 +8341,10 @@ # before this can be enabled. hardcode_into_libs=yes
- # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 8350 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi
# We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9244,7 +9221,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9247 "configure" +#line 9224 "configure" #include "confdefs.h"
#if HAVE_DLFCN_H @@ -9344,7 +9321,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9347 "configure" +#line 9324 "configure" #include "confdefs.h"
#if HAVE_DLFCN_H @@ -9675,9 +9652,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'` -gcc_ver=`gcc -dumpversion` - # An ERE matcher. EGREP=$lt_EGREP
@@ -9811,11 +9785,11 @@
# Dependencies to place before the objects being linked to create a # shared library. -predep_objects=`echo $lt_predep_objects | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +predep_objects=$lt_predep_objects
# Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=`echo $lt_postdep_objects | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +postdep_objects=$lt_postdep_objects
# Dependencies to place before the objects being linked to create a # shared library. @@ -9827,7 +9801,7 @@
# The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=`echo $lt_compiler_lib_search_path | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +compiler_lib_search_path=$lt_compiler_lib_search_path
# Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -9907,7 +9881,7 @@ link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries -sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -11687,11 +11661,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:11690: $lt_compile"" >&5) + (eval echo ""$as_me:11664: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11694: $? = $ac_status" >&5 + echo "$as_me:11668: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11791,11 +11765,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:11794: $lt_compile"" >&5) + (eval echo ""$as_me:11768: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11798: $? = $ac_status" >&5 + echo "$as_me:11772: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12323,31 +12297,10 @@ # before this can be enabled. hardcode_into_libs=yes
- # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 12330 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi
# We used to test for /lib/ld.so.1 and disable shared libraries on @@ -12731,9 +12684,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_CXX
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'` -gcc_ver=`gcc -dumpversion` - # An ERE matcher. EGREP=$lt_EGREP
@@ -12867,11 +12817,11 @@
# Dependencies to place before the objects being linked to create a # shared library. -predep_objects=`echo $lt_predep_objects_CXX | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +predep_objects=$lt_predep_objects_CXX
# Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=`echo $lt_postdep_objects_CXX | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +postdep_objects=$lt_postdep_objects_CXX
# Dependencies to place before the objects being linked to create a # shared library. @@ -12883,7 +12833,7 @@
# The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=`echo $lt_compiler_lib_search_path_CXX | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
# Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -12963,7 +12913,7 @@ link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries -sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -13385,11 +13335,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:13388: $lt_compile"" >&5) + (eval echo ""$as_me:13338: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13392: $? = $ac_status" >&5 + echo "$as_me:13342: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13489,11 +13439,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:13492: $lt_compile"" >&5) + (eval echo ""$as_me:13442: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13496: $? = $ac_status" >&5 + echo "$as_me:13446: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14934,31 +14884,10 @@ # before this can be enabled. hardcode_into_libs=yes
- # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 14941 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi
# We used to test for /lib/ld.so.1 and disable shared libraries on @@ -15342,9 +15271,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_F77
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'` -gcc_ver=`gcc -dumpversion` - # An ERE matcher. EGREP=$lt_EGREP
@@ -15478,11 +15404,11 @@
# Dependencies to place before the objects being linked to create a # shared library. -predep_objects=`echo $lt_predep_objects_F77 | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +predep_objects=$lt_predep_objects_F77
# Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=`echo $lt_postdep_objects_F77 | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +postdep_objects=$lt_postdep_objects_F77
# Dependencies to place before the objects being linked to create a # shared library. @@ -15494,7 +15420,7 @@
# The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=`echo $lt_compiler_lib_search_path_F77 | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +compiler_lib_search_path=$lt_compiler_lib_search_path_F77
# Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -15574,7 +15500,7 @@ link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries -sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -15716,11 +15642,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:15719: $lt_compile"" >&5) + (eval echo ""$as_me:15645: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15723: $? = $ac_status" >&5 + echo "$as_me:15649: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15984,11 +15910,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:15987: $lt_compile"" >&5) + (eval echo ""$as_me:15913: $lt_compile"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15991: $? = $ac_status" >&5 + echo "$as_me:15917: $? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16088,11 +16014,11 @@ -e 's:.*FLAGS}{0,1} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo ""$as_me:16091: $lt_compile"" >&5) + (eval echo ""$as_me:16017: $lt_compile"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16095: $? = $ac_status" >&5 + echo "$as_me:16021: $? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17553,31 +17479,10 @@ # before this can be enabled. hardcode_into_libs=yes
- # find out which ABI we are using - libsuff= - case "$host_cpu" in - x86_64*|s390x*|powerpc64*) - echo '#line 17560 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: "$ac_compile"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 - sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" - ;; - esac - fi - rm -rf conftest* - ;; - esac - # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", $2)); skip = 1; } { if (!skip) print $0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi
# We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17961,9 +17866,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_GCJ
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'` -gcc_ver=`gcc -dumpversion` - # An ERE matcher. EGREP=$lt_EGREP
@@ -18097,11 +17999,11 @@
# Dependencies to place before the objects being linked to create a # shared library. -predep_objects=`echo $lt_predep_objects_GCJ | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +predep_objects=$lt_predep_objects_GCJ
# Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=`echo $lt_postdep_objects_GCJ | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +postdep_objects=$lt_postdep_objects_GCJ
# Dependencies to place before the objects being linked to create a # shared library. @@ -18113,7 +18015,7 @@
# The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=`echo $lt_compiler_lib_search_path_GCJ | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
# Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18193,7 +18095,7 @@ link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries -sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -18445,9 +18347,6 @@ # Is the compiler the GNU C compiler? with_gcc=$GCC_RC
-gcc_dir=`gcc -print-file-name=. | $SED 's,/.$,,'` -gcc_ver=`gcc -dumpversion` - # An ERE matcher. EGREP=$lt_EGREP
@@ -18581,11 +18480,11 @@
# Dependencies to place before the objects being linked to create a # shared library. -predep_objects=`echo $lt_predep_objects_RC | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +predep_objects=$lt_predep_objects_RC
# Dependencies to place after the objects being linked to create a # shared library. -postdep_objects=`echo $lt_postdep_objects_RC | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +postdep_objects=$lt_postdep_objects_RC
# Dependencies to place before the objects being linked to create a # shared library. @@ -18597,7 +18496,7 @@
# The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path=`echo $lt_compiler_lib_search_path_RC | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +compiler_lib_search_path=$lt_compiler_lib_search_path_RC
# Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -18677,7 +18576,7 @@ link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries -sys_lib_search_path_spec=`echo $lt_sys_lib_search_path_spec | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"` +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec @@ -25945,7 +25844,6 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t -s,@SED@,$SED,;t t s,@EGREP@,$EGREP,;t t s,@LN_S@,$LN_S,;t t s,@ECHO@,$ECHO,;t t
389-commits@lists.fedoraproject.org