* configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER. (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep.* configure: Regenerate.

3 files changed, 22 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 902e43e45af..5a63d614b3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-06  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+        * configure.in (NS_HAVE_INTEGER): Rename to NS_HAVE_NSINTEGER.
+        (C_SWITCH_X_SYSTEM): Drop -MMD -MP under NS_IMPL_GNUstep.
+
+        * configure: Regenerate.
+
 2008-08-06  Andreas Schwab  <schwab@suse.de>
 
         * configure.in: Fix quoting.
diff --git a/configure b/configure
index 1a422c11492..6cdecb3c863 100755
--- a/configure
+++ b/configure
@@ -9332,7 +9332,7 @@ if test $ac_cv_header_AppKit_AppKit_h = yes; then
 fi
 
 
-  NS_HAVE_INTEGER=yes
+  NS_HAVE_NSINTEGER=yes
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9365,17 +9365,17 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
          test -z "$ac_c_werror_flag" ||
          test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
-  ns_have_integer=yes
+  ns_have_nsinteger=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-        ns_have_integer=no
+        ns_have_nsinteger=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $ns_have_integer = no; then
-    NS_HAVE_INTEGER=no
+  if test $ns_have_nsinteger = no; then
+    NS_HAVE_NSINTEGER=no
   fi
 fi
 if test "${HAVE_NS}" = yes; then
@@ -14894,10 +14894,10 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
   fi
-  if test "${NS_HAVE_INTEGER}" = "yes"; then
+  if test "${NS_HAVE_NSINTEGER}" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
-#define NS_HAVE_INTEGER 1
+#define NS_HAVE_NSINTEGER 1
 _ACEOF
 
   fi
diff --git a/configure.in b/configure.in
index 0de2dab2a44..4f509b5b768 100644
--- a/configure.in
+++ b/configure.in
@@ -1236,13 +1236,13 @@ if test "${with_ns}" != no; then
      LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES}"
   fi
   AC_CHECK_HEADER(AppKit/AppKit.h, HAVE_NS=yes)
-  NS_HAVE_INTEGER=yes
+  NS_HAVE_NSINTEGER=yes
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <Foundation/NSObjCRuntime.h>],
                                      [NSInteger i;])],
-                    ns_have_integer=yes,
-                    ns_have_integer=no)
-  if test $ns_have_integer = no; then
-    NS_HAVE_INTEGER=no
+                    ns_have_nsinteger=yes,
+                    ns_have_nsinteger=no)
+  if test $ns_have_nsinteger = no; then
+    NS_HAVE_NSINTEGER=no
   fi
 fi
 if test "${HAVE_NS}" = yes; then
@@ -2054,8 +2054,8 @@ if test "${HAVE_NS}" = "yes"; then
   if test "${NS_IMPL_GNUSTEP}" = "yes"; then
     AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS windowing under GNUstep.])
   fi
-  if test "${NS_HAVE_INTEGER}" = "yes"; then
-    AC_DEFINE(NS_HAVE_INTEGER, 1, [Define to 1 if `NSInteger' is defined.])
+  if test "${NS_HAVE_NSINTEGER}" = "yes"; then
+    AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is defined.])
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
@@ -2610,7 +2610,7 @@ AH_BOTTOM([
 # endif
 # ifdef NS_IMPL_GNUSTEP
 /* See also .m.o rule in Makefile.in */
-#  define C_SWITCH_X_SYSTEM -MMD -MP -D_REENTRANT -fPIC -fno-strict-aliasing
+#  define C_SWITCH_X_SYSTEM -D_REENTRANT -fPIC -fno-strict-aliasing
 #  define GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE
 #  define OTHER_FILES ns-app
 # else /* NS_IMPL_COCOA */