Changeset 20832 for gsdl/trunk/common-src/configure

Timestamp:

2009-10-21T16:47:07+13:00 (15 years ago)

Author:

ak19

Message:

Libiconv and libexpat are now compiled up during configure time rather than during Make. Committing files affected with adjustments related to this change, of which setup.bash adds the lib folder in common-src packages (generated by compiling libiconv) to the LD_LIBRARY_PATH for now. The last is probably not necessary since libiconv is generated as a static library (not shared).

File:

• gsdl/trunk/common-src/configure (modified) (3 diffs)

gsdl/trunk/common-src/configure

@@ -310 +310 @@
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all packages indexers"
+ac_subdirs_all="$ac_subdirs_all packages"
+ac_subdirs_all="$ac_subdirs_all indexers"
 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 PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_ACCENTFOLD USE_SQLITE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
@@ -7249 +7250 @@
 
 
-subdirs="$subdirs packages indexers"
+subdirs="$subdirs packages"
+
+
+commonsrcprefix=`pwd`
+ac_configure_args="$ac_configure_args --with-libiconv-prefix=$commonsrcprefix/packages/iconv"
+
+
+subdirs="$subdirs indexers"
 
 
@@ -7258 +7266 @@
          src/gdbmedit/gdbmget/Makefile \
          src/gdbmedit/gdbmset/Makefile \
-         src/gdbmedit/gdbmkeys/Makefile \
-         src/gdbmedit/gdbmdel/Makefile \
+     src/gdbmedit/gdbmkeys/Makefile \
+     src/gdbmedit/gdbmdel/Makefile \
          src/getpw/Makefile"