Changeset 13724

Timestamp:

2007-01-22T16:49:11+13:00 (17 years ago)

Author:

kjdon

Message:

remove mg and mgpp from list of Makefiles to generate, add indexers into list of subdirs to configure. need to pass in bindir to this

Location:

branches/changing-indexers-branch/gsdl

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (1 diff)

branches/changing-indexers-branch/gsdl/configure

@@ -310 +310 @@
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all packages"
+ac_subdirs_all="$ac_subdirs_all packages 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 CFLAGS CC LDFLAGS 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 MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC GDBM_LIBPATH GDBM_INCLUDE gsdlos MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
@@ -7400 +7400 @@
 # ---------------------------------------------------------------------------
 
-
-subdirs="$subdirs packages"
+# indexers needs a bindir option to get the binaries into the right place
+gsdlprefix=`pwd`
+ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
+
+
+subdirs="$subdirs packages indexers"
 
 
 # the list of folders in the src folder
-srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile \
-          src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
+srclist="src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
           src/oaiservr/Makefile src/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
 
-                                                                                                    ac_config_files="$ac_config_files packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile packages/mg/src/scripts/Makefile packages/mg/lib/Makefile lib/Makefile Makefile $srclist $moduleDirs"
+                                                  ac_config_files="$ac_config_files packages/Makefile lib/Makefile Makefile $srclist $moduleDirs"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -7936 +7939 @@
   # Handling of arguments.
   "packages/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/Makefile" ;;
-  "packages/mg/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/Makefile" ;;
-  "packages/mg/src/text/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/text/Makefile" ;;
-  "packages/mg/src/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/images/Makefile" ;;
-  "packages/mg/src/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/src/scripts/Makefile" ;;
-  "packages/mg/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES packages/mg/lib/Makefile" ;;
   "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;

branches/changing-indexers-branch/gsdl/configure.in

@@ -417 +417 @@
 dnl not needed any more?
 dnl ac_configure_args="$ac_configure_args --build=$build --target=$target"
-AC_CONFIG_SUBDIRS(packages)
+
+# indexers needs a bindir option to get the binaries into the right place
+gsdlprefix=`pwd`
+ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
+AC_CONFIG_SUBDIRS(packages indexers)
 
 # the list of folders in the src folder
-srclist="src/mgpp/lib/Makefile src/mgpp/text/Makefile src/mgpp/Makefile \
-          src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
+srclist="src/hashfile/Makefile src/colservr/Makefile src/recpt/Makefile src/txt2db/Makefile \
           src/oaiservr/Makefile src/db2txt/Makefile src/getpw/Makefile src/phind/generate/Makefile"
 
-AC_OUTPUT(packages/Makefile packages/mg/Makefile packages/mg/src/text/Makefile packages/mg/src/images/Makefile 
-          packages/mg/src/scripts/Makefile packages/mg/lib/Makefile
-      lib/Makefile Makefile $srclist $moduleDirs)
-
-
+AC_OUTPUT(packages/Makefile lib/Makefile Makefile $srclist $moduleDirs)
+
+