From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Mon, 8 Aug 2005 13:47:18 +0000 (+0000)
Subject: reuse preconfigured internal gstep-make
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c2b01d7c1d08df038f77ad6d004de19ce62dad5;p=sope

reuse preconfigured internal gstep-make


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1007 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/configure b/configure
index cbbd35f3..edfc3d3b 100755
--- a/configure
+++ b/configure
@@ -26,6 +26,7 @@ DARG_IS_FHS=1
 SOPE_SRCDIR="$PWD" # TODO: rather use location of configure (using basename)
 NGSTREAMS_DIR="${SOPE_SRCDIR}/sope-core/NGStreams"
 GSTEPMAKE_SRCDIR="${SOPE_SRCDIR}/gnustep-make"
+INTERNAL_MAKEDIR="${SOPE_SRCDIR}/.gsmake"
 
 # TODO: add pg_config, mysql_config etc!
 LINK_SYSLIBDIRS="-L/usr/local/pgsql/lib -L/usr/local/lib -L/usr/lib"
@@ -108,9 +109,16 @@ _ACEOFWARN
 }
 
 function setupInternalGSMake() {
-  if test -d gnustep-make; then
+  if test -f ${INTERNAL_MAKEDIR}/Library/Makefiles/GNUstep.sh; then
+    ARG_GSMAKE="${INTERNAL_MAKEDIR}/Library/Makefiles/"
+    ARG_IS_FHS=1
+    DARG_IS_FHS=1
+    ARG_WITH_GNUSTEP=0
+    if test "x$ARG_PREFIX" = "x"; then
+      ARG_PREFIX="/usr/local/"
+    fi
+  elif test -d gnustep-make; then
     SETUP_COMBO="gnu-fd-nil"
-    SETUP_MAKEDIR="${SOPE_SRCDIR}/.gsmake"
     SETUP_LOGNAME="config-gstepmake.log"
     if test -d /Developer/Applications/Xcode.app; then
       # rather weird OSX test, right? ;->
@@ -122,17 +130,17 @@ function setupInternalGSMake() {
 
     cd "$GSTEPMAKE_SRCDIR"
     ./configure >${pregsmdir}/${SETUP_LOGNAME} \
-      --prefix="${SETUP_MAKEDIR}" \
+      --prefix="${INTERNAL_MAKEDIR}" \
       --without-system-root \
-      --with-network-root="${SETUP_MAKEDIR}" \
-      --with-local-root="${SETUP_MAKEDIR}" \
-      --with-user-root="${SETUP_MAKEDIR}" \
+      --with-network-root="${INTERNAL_MAKEDIR}" \
+      --with-local-root="${INTERNAL_MAKEDIR}" \
+      --with-user-root="${INTERNAL_MAKEDIR}" \
       --with-library-combo="${SETUP_COMBO}"
 
     echo -n ".. install .."
     make install >>${pregsmdir}/${SETUP_LOGNAME}
     
-    ARG_GSMAKE="${SETUP_MAKEDIR}/Library/Makefiles/"
+    ARG_GSMAKE="${INTERNAL_MAKEDIR}/Library/Makefiles/"
     ARG_IS_FHS=1
     DARG_IS_FHS=1
     ARG_WITH_GNUSTEP=0