fixed OSX detection

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

diff --git a/configure b/configure
index edfc3d3b15316e19ede5a635fcbb8be8fb0b151d..efd991e3b0788bda532b877a23bac47b473914e4 100755 (executable)
--- a/configure
+++ b/configure
@@ -27,6 +27,7 @@ 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"
+USES_INTERNAL_MAKE=no
 
 # TODO: add pg_config, mysql_config etc!
 LINK_SYSLIBDIRS="-L/usr/local/pgsql/lib -L/usr/local/lib -L/usr/lib"
@@ -114,6 +115,7 @@ function setupInternalGSMake() {
     ARG_IS_FHS=1
     DARG_IS_FHS=1
     ARG_WITH_GNUSTEP=0
+    USES_INTERNAL_MAKE=yes
     if test "x$ARG_PREFIX" = "x"; then
       ARG_PREFIX="/usr/local/"
     fi
@@ -144,6 +146,7 @@ function setupInternalGSMake() {
     ARG_IS_FHS=1
     DARG_IS_FHS=1
     ARG_WITH_GNUSTEP=0
+    USES_INTERNAL_MAKE=yes
     if test "x$ARG_PREFIX" = "x"; then
       ARG_PREFIX="/usr/local/"
     fi
@@ -193,11 +196,13 @@ function validateGNUstepArgs() {
 
 function setupAppleArgs() {
   ARG_WITH_STRIP=0
-  ARG_WITH_GNUSTEP=1
+  if test "x${USES_INTERNAL_MAKE}" = "no"; then
+    ARG_WITH_GNUSTEP=1
+  fi
   
   if test "x${xLIBRARY_COMBO}" != "xapple-apple-nil"; then
     if test "x${LIBRARY_COMBO}" != "xapple-apple-apple"; then
-      echo "WARNING: detected unusual GNUstep setup: ${LIBRARY_COMBO}"
+      echo "WARNING: detected MacOSX GNUstep setup: ${LIBRARY_COMBO}"
       echo ""
     fi
   fi