Changeset 31615 for lang/objective-cplusplus/i3/trunk

Timestamp:

03/27/09 22:25:55 (4 years ago)

Author:

saturday06

Message:

netabare

Files:

• lang/objective-cplusplus/i3/trunk/configure.ac (modified) (6 diffs)

lang/objective-cplusplus/i3/trunk/configure.ac

@@ -1 +1 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
+
+CFLAGS_before_configure=$CFLAGS
+CXXFLAGS_before_configure=$CXXFLAGS
 
 AC_PREREQ(2.60)
@@ -11 +14 @@
 
 # ---------------------------------------
-# this should be set before AC_PROG_CC, AC_USE_SYSTEM_EXTENSIONS
-AC_ARG_ENABLE(debug,
-    AS_HELP_STRING([--enable-debug], [build debug binaries]),
-        enable_debug="$enableval", enable_debug="no")
-AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
-if test "$enable_debug" = "yes"; then
-  if test "$CFLAGS" = ""; then
-    CFLAGS="-O0 -g"
-  fi
-  if test "$CXXFLAGS" = ""; then
-    CXXFLAGS="-O0 -g"
-  fi
-fi
-
-# ---------------------------------------
 # Programs
 AC_USE_SYSTEM_EXTENSIONS
@@ -35 +23 @@
 AM_CONDITIONAL(USE_GCH, test "$GXX" = "yes")
 
+AC_ARG_ENABLE(debug,
+    AS_HELP_STRING([--enable-debug], [build debug binaries]),
+        enable_debug="$enableval", enable_debug="no")
+AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = "yes")
+if test "$enable_debug" = "yes"; then
+  if test "$CFLAGS_before_configure" = ""; then
+    CFLAGS="-O0 -g"
+  fi
+  if test "$CXXFLAGS_before_configure" = ""; then
+    CXXFLAGS="-O0 -g"
+  fi
+fi
+
 # ---------------------------------------
 # OS
@@ -45 +46 @@
     cygwin*)
         with_os=unix
-        with_gui_default=windows
+        with_gui_default=gnustep
         with_cygwin=yes
         ;;
@@ -71 +72 @@
     gnustep)
         which gnustep-config > /dev/null
-        if test $? -ne 0; then
+        if test $? -eq 0; then
+            if test "$enable_debug" = "yes"; then
+                debug_arg="--debug"
+            fi
+            CXXFLAGS="$CXXFLAGS `perl $srcdir/scripts/gnustep-config-filter.pl $debug_arg gnustep-config --objc-flags`"
+            LIBS="$LIBS `perl $srcdir/scripts/gnustep-config-filter.pl $debug_arg gnustep-config --gui-libs`"
+        else
             AC_MSG_WARN([gnustep-config not found])
         fi
 
-        if test "$enable_debug" = "yes"; then
-            debug_arg="--debug"
-        fi
-
-        CXXFLAGS="$CXXFLAGS -x objective-c++ `perl $srcdir/scripts/gnustep-config-filter.pl $debug_arg gnustep-config --objc-flags`"
+        CXXFLAGS="$CXXFLAGS -x objective-c++"
         LDFLAGS="$LDFLAGS -x none"
-        LIBS="$LIBS `perl $srcdir/scripts/gnustep-config-filter.pl $debug_arg gnustep-config --gui-libs`"
         with_gui=cocoa
     ;;
@@ -139 +141 @@
 
 AC_LANG_PUSH([C])
-AM_GNU_GETTEXT_VERSION([0.16.1])
+AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT
 AC_LANG_POP