Drop apache 1 build-dependency

[sope] / configure

diff --git a/configure b/configure
index 3b8ef60aebfdf9acea5bf7ad564ffb17f506ae57..06608f3863b74f3e752f30722332a00245094566 100755 (executable)
--- a/configure
+++ b/configure
@@ -141,7 +141,8 @@ function setupInternalGSMake() {
     ./configure >${pregsmdir}/${SETUP_LOGNAME} \
       ${ENABLE_PCH_OPT} \
       --prefix="${INTERNAL_MAKEDIR}" \
-      --without-system-root \
+      --with-config-file="${INTERNAL_MAKEDIR}/GNUstep.conf" \
+      --with-system-root="${INTERNAL_MAKEDIR}" \
       --with-network-root="${INTERNAL_MAKEDIR}" \
       --with-local-root="${INTERNAL_MAKEDIR}" \
       --with-user-root="${INTERNAL_MAKEDIR}" \
@@ -164,7 +165,7 @@ function setupInternalGSMake() {
       echo ".. done (log in ${SETUP_LOGNAME})."
     else
       echo "error: failed to setup embedded gnustep-make sources!"
-      cat ${pregsmdir}/${SETUP_LOGNAME}
+      tail ${pregsmdir}/${SETUP_LOGNAME}
       exit 1
     fi
   else
@@ -364,16 +365,16 @@ function genConfigMake() {
   #       common.make
   cfgwrite "ifeq (\$(findstring _64, \$(GNUSTEP_HOST_CPU)), _64)"
   cfgwrite "CONFIGURE_64BIT:=yes"
-  cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)"
-  cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/lib64/"
-  cfgwrite "endif"
-  cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR) -L/usr/lib64"
+  cfgwrite "CGS_LIBDIR_NAME:=lib64"
   cfgwrite "else"
-  cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)"
-  cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/lib/"
+  cfgwrite "CGS_LIBDIR_NAME:=lib"
   cfgwrite "endif"
-  cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR) -L/usr/lib"
+
+  cfgwrite "ifneq (\$(FHS_INSTALL_ROOT),)"
+  cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/\$(CGS_LIBDIR_NAME)/"
+  cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR)"
   cfgwrite "endif"
+  cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L/usr/\$(CGS_LIBDIR_NAME)/"
   
   cfgwrite "# avoid a gstep-make warning"
   cfgwrite "PATH:=\$(GNUSTEP_SYSTEM_ROOT)/Tools:\$(PATH)"