Changeset 20832 for indexers/trunk/mgpp/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:

• indexers/trunk/mgpp/configure (modified) (4 diffs)

indexers/trunk/mgpp/configure

@@ -310 +310 @@
 #endif"
 
-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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PACKAGE VERSION COMPAT32BITFLAGS ENABLE_ACCENTFOLD CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR UNAC_DIR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os PACKAGE VERSION COMPAT32BITFLAGS ENABLE_ACCENTFOLD CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT AWK YACC CC CFLAGS ac_ct_CC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB CPP EGREP U ANSI2KNR UNAC_DIR LIBICONV_DIR ALLOCA LIBOBJS JNIINC JNISUFFIX JNIFLAGS LTLIBOBJS'
 ac_subst_files=''
 
@@ -867 +867 @@
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-unac=dir         Use local unac library and headers
+  --with-libiconv-prefix=dir         Use local libiconv library
   --with-dmalloc          use dmalloc, as in
                           ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz
@@ -4339 +4340 @@
 cat >>confdefs.h <<_ACEOF
 #define UNAC_DIR "$UNAC_DIR"
+_ACEOF
+
+
+
+
+# Check whether --with-unac or --without-unac was given.
+if test "${with_unac+set}" = set; then
+  withval="$with_unac"
+  LIBICONV_DIR=$withval
+fi;
+cat >>confdefs.h <<_ACEOF
+#define LIBICONV_DIR "$LIBICONV_DIR"
 _ACEOF
 
@@ -8442 +8455 @@
 s,@ANSI2KNR@,$ANSI2KNR,;t t
 s,@UNAC_DIR@,$UNAC_DIR,;t t
+s,@LIBICONV_DIR@,$LIBICONV_DIR,;t t
 s,@ALLOCA@,$ALLOCA,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t