[33735] trunk/base/configure
afb at macports.org
afb at macports.org
Mon Feb 4 03:47:51 PST 2008
Revision: 33735
http://trac.macosforge.org/projects/macports/changeset/33735
Author: afb at macports.org
Date: 2008-02-04 03:47:46 -0800 (Mon, 04 Feb 2008)
Log Message:
-----------
regenerate configure
Modified Paths:
--------------
trunk/base/configure
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2008-02-04 11:46:28 UTC (rev 33734)
+++ trunk/base/configure 2008-02-04 11:47:46 UTC (rev 33735)
@@ -6095,7 +6095,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
{ { echo "$as_me:$LINENO: error: GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library" >&5
echo "$as_me: error: GNUSTEP_SYSTEM_ROOT is not defined in your environment, preventing the use of GNUstep's Foundation library" >&2;}
@@ -6110,9 +6111,15 @@
echo $ECHO_N "checking for GNUstep Foundation library... $ECHO_C" >&6; }
# 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
if test "${ac_cv_objc_foundation_gnustep+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10839,7 +10846,7 @@
echo $ECHO_N "checking for X11 prefix... $ECHO_C" >&6; }
X_INCLUDES_PREFIX=`echo "$x_includes" | sed "s,/include,,"`
X_LIBRARIES_PREFIX=`echo "$x_libraries" | sed "s,/lib,,"`
-if test "x$have_x" = "xyes" -a "x$X_INCLUDES_PREFIX" = "x$X_LIBRARIES_PREFIX"; then
+if test "x$have_x" = "xyes" -a "x$X_INCLUDES_PREFIX" = "x$X_LIBRARIES_PREFIX" -a "x$X_LIBRARIES_PREFIX" != x; then
x11prefix=$X_LIBRARIES_PREFIX
fi
{ echo "$as_me:$LINENO: result: $x11prefix" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080204/42d1b2c2/attachment.html
More information about the macports-changes
mailing list