Author: wlux
Date: Mon Aug 17 14:48:41 2015
New Revision: 38898
URL: http://svn.gna.org/viewcvs/gnustep?rev=38898&view=rev
Log:
Fix previous change, which had broken the autoconf tests for Objective
C++, the fragile API and native exception support, by using the
correct autoconf macros.
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/configure
tools/make/trunk/configure.ac
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=38898&r1=38897&r2=38898&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Mon Aug 17 14:48:41 2015
@@ -1,3 +1,11 @@
+2015-08-17 Wolfgang Lux <[email protected]>
+
+ * configure.ac: Fix the previous change, which had broken the tests
+ for Objective C++, the fragile API and native exception support,
+ by using the correct autoconf macros.
+
+ * configure: Regenerated.
+
2015-08-16 Richard Frith-Macdonald <[email protected]>
* library-combo.make: Use David's suggested runtime flag for the
Modified: tools/make/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/configure?rev=38898&r1=38897&r2=38898&view=diff
==============================================================================
--- tools/make/trunk/configure (original)
+++ tools/make/trunk/configure Mon Aug 17 14:48:41 2015
@@ -5901,10 +5901,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int
-main ()
-{
-
@interface ObjCClass
{
@@ -5923,9 +5919,6 @@
return 0;
}
- ;
- return 0;
-}
_ACEOF
if ac_fn_cxx_try_compile "$LINENO"; then :
objcc=yes
@@ -5975,10 +5968,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int
-main ()
-{
-
/* Note that we never execute this code so it does not really matter
what it is. We are testing that the compiler accepts the
'-fobjc-nonfragile-abi' flag. */
@@ -5991,9 +5980,6 @@
return __has_feature(objc_nonfragile_abi) ? 0 : 1;
}
- ;
- return 0;
-}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
USE_NONFRAGILE_ABI=yes
@@ -6161,10 +6147,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-int
-main ()
-{
-
#include <objc/objc.h>
@interface Test { id isa; } @end
@@ -6182,9 +6164,6 @@
return 0;
}
- ;
- return 0;
-}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
USE_OBJC_EXCEPTIONS=yes
Modified: tools/make/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/configure.ac?rev=38898&r1=38897&r2=38898&view=diff
==============================================================================
--- tools/make/trunk/configure.ac (original)
+++ tools/make/trunk/configure.ac Mon Aug 17 14:48:41 2015
@@ -1369,7 +1369,7 @@
CXXPPFLAGS_saved="$CXXPPFLAGS"
CXXPPFLAGS="$CXXPPFLAGS -x objective-c++"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
@interface ObjCClass
{
@@ -1387,7 +1387,7 @@
{
return 0;
}
-])], objcc=yes, objcc=no)
+]])], objcc=yes, objcc=no)
AC_MSG_RESULT($objcc)
if test x"$objcc" = x"no"; then
OBJCXX=
@@ -1420,7 +1420,7 @@
# something with -fobjc-nonfragile-abi.
CFLAGS_no_nonfragile="$CFLAGS"
CFLAGS="$CFLAGS -fobjc-nonfragile-abi"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
/* Note that we never execute this code so it does not really matter
what it is. We are testing that the compiler accepts the
'-fobjc-nonfragile-abi' flag. */
@@ -1432,7 +1432,7 @@
#endif
return __has_feature(objc_nonfragile_abi) ? 0 : 1;
}
-])], USE_NONFRAGILE_ABI=yes, USE_NONFRAGILE_ABI=no)
+]])], USE_NONFRAGILE_ABI=yes, USE_NONFRAGILE_ABI=no)
AC_MSG_RESULT($USE_NONFRAGILE_ABI)
CFLAGS="$CFLAGS_no_nonfragile"
@@ -1569,7 +1569,7 @@
# something with @try/@catch/@finally in it.
CFLAGS_no_exceptions="$CFLAGS"
CFLAGS="$CFLAGS -fexceptions -fobjc-exceptions"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#include <objc/objc.h>
@interface Test { id isa; } @end
@@ -1586,7 +1586,7 @@
}
return 0;
}
- ])], USE_OBJC_EXCEPTIONS=yes, USE_OBJC_EXCEPTIONS=no)
+ ]])], USE_OBJC_EXCEPTIONS=yes, USE_OBJC_EXCEPTIONS=no)
if test x"$USE_OBJC_EXCEPTIONS" = x"no"; then
AC_MSG_RESULT(no)
else
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
