[33734] trunk/base/m4/foundation.m4

afb at macports.org afb at macports.org
Mon Feb 4 03:46:51 PST 2008


Revision: 33734
          http://trac.macosforge.org/projects/macports/changeset/33734
Author:   afb at macports.org
Date:     2008-02-04 03:46:28 -0800 (Mon, 04 Feb 2008)

Log Message:
-----------
use gnustep-config, where available

Modified Paths:
--------------
    trunk/base/m4/foundation.m4

Modified: trunk/base/m4/foundation.m4
===================================================================
--- trunk/base/m4/foundation.m4	2008-02-04 11:33:44 UTC (rev 33733)
+++ trunk/base/m4/foundation.m4	2008-02-04 11:46:28 UTC (rev 33734)
@@ -341,7 +341,8 @@
 	fi
 
 	if test x"${with_objc_foundation}" == x || test x${with_objc_foundation} == x"GNUstep"; then
-		if test x"${GNUSTEP_SYSTEM_ROOT}" == x; then
+		GNUSTEP_CONFIG=/usr/bin/gnustep-config
+		if test ! -x "${GNUSTEP_CONFIG}" -a x"${GNUSTEP_SYSTEM_ROOT}" == x; then
 			if test x"${with_objc_foundation}" == x"GNUstep"; then
 				AC_MSG_ERROR([GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library])
 			else
@@ -352,9 +353,15 @@
 			AC_MSG_CHECKING([for GNUstep Foundation library])
 
 			# Set GNUstep LDFLAGS, CPPFLAGS, and LIBS
+			if test -x ${GNUSTEP_CONFIG}; then
+			GNUSTEP_LDFLAGS="`${GNUSTEP_CONFIG} --objc-libs`"
+			GNUSTEP_CPPFLAGS="`${GNUSTEP_CONFIG} --objc-flags`"
+			GNUSTEP_LIBS="`${GNUSTEP_CONFIG} --base-libs`"
+			else
 			GNUSTEP_LDFLAGS="-L${GNUSTEP_SYSTEM_ROOT}/Library/Libraries/"
 			GNUSTEP_CPPFLAGS="-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/"
 			GNUSTEP_LIBS="-lgnustep-base"
+			fi
 
 			AC_CACHE_VAL(ac_cv_objc_foundation_gnustep, [
 				# Save old LDFLAGS, CPPFLAGS, and LIBS

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080204/8e258aaa/attachment.html


More information about the macports-changes mailing list