Author: rfm
Date: Wed Mar 2 15:42:43 2016
New Revision: 39443
URL: http://svn.gna.org/viewcvs/gnustep?rev=39443&view=rev
Log:
Add some checks that the runtime supports features we need for ng
Modified:
libs/base/trunk/configure
libs/base/trunk/configure.ac
Modified: libs/base/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/configure?rev=39443&r1=39442&r2=39443&view=diff
==============================================================================
--- libs/base/trunk/configure (original)
+++ libs/base/trunk/configure Wed Mar 2 15:42:43 2016
@@ -7910,6 +7910,9 @@
OBJCSYNC=1
else
OBJCSYNC=0
+ if test "$OBJC_RUNTIME_LIB" = "ng"; then
+ as_fn_error $? "The objc runtime library does not appear to have
synchronisation support. Try re-configuring gnustep-make with a CPPFLAGS
variable containing a -L point to specify the directory containing the correct
libobjc, or using the --with-objc-lib-flag=... option." "$LINENO" 5
+ fi
fi
@@ -7938,6 +7941,9 @@
OBJC2RUNTIME=1
else
OBJC2RUNTIME=0
+ if test "$OBJC_RUNTIME_LIB" = "ng"; then
+ as_fn_error $? "The objc runtime library does not appear to have
property support. Try re-configuring gnustep-make with a CPPFLAGS variable
containing a -L point to specify the directory containing the correct libobjc,
or using the --with-objc-lib-flag=... option." "$LINENO" 5
+ fi
fi
fi
@@ -7960,6 +7966,9 @@
HAVE_BLOCKS=1
else
HAVE_BLOCKS=0
+ if test "$OBJC_RUNTIME_LIB" = "ng"; then
+ as_fn_error $? "The objc runtime library does not appear to have blocks
support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a
-L point to specify the directory containing the correct libobjc, or using the
--with-objc-lib-flag=... option." "$LINENO" 5
+ fi
fi
@@ -7992,15 +8001,17 @@
if test $non_fragile = yes; then
OBJCLIBS="$OBJLIBS -fobjc-nonfragile-abi"
GS_NONFRAGILE=1
- # Check whether --enable-mixedabi was given.
+ if test "$OBJC_RUNTIME_LIB" != "ng"; then
+ # Check whether --enable-mixedabi was given.
if test "${enable_mixedabi+set}" = set; then :
enableval=$enable_mixedabi;
else
enable_mixedabi=yes
fi
- if test $enable_mixedabi = yes; then
- GS_MIXEDABI=1
+ if test $enable_mixedabi = yes; then
+ GS_MIXEDABI=1
+ fi
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $non_fragile" >&5
Modified: libs/base/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/configure.ac?rev=39443&r1=39442&r2=39443&view=diff
==============================================================================
--- libs/base/trunk/configure.ac (original)
+++ libs/base/trunk/configure.ac Wed Mar 2 15:42:43 2016
@@ -1955,6 +1955,9 @@
OBJCSYNC=1
else
OBJCSYNC=0
+ if test "$OBJC_RUNTIME_LIB" = "ng"; then
+ AC_MSG_ERROR([The objc runtime library does not appear to have
synchronisation support. Try re-configuring gnustep-make with a CPPFLAGS
variable containing a -L point to specify the directory containing the correct
libobjc, or using the --with-objc-lib-flag=... option.])
+ fi
fi
AC_SUBST(OBJCSYNC)
@@ -1972,6 +1975,9 @@
OBJC2RUNTIME=1
else
OBJC2RUNTIME=0
+ if test "$OBJC_RUNTIME_LIB" = "ng"; then
+ AC_MSG_ERROR([The objc runtime library does not appear to have property
support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a
-L point to specify the directory containing the correct libobjc, or using the
--with-objc-lib-flag=... option.])
+ fi
fi
fi
AC_SUBST(OBJC2RUNTIME)
@@ -1984,6 +1990,9 @@
HAVE_BLOCKS=1
else
HAVE_BLOCKS=0
+ if test "$OBJC_RUNTIME_LIB" = "ng"; then
+ AC_MSG_ERROR([The objc runtime library does not appear to have blocks
support. Try re-configuring gnustep-make with a CPPFLAGS variable containing a
-L point to specify the directory containing the correct libobjc, or using the
--with-objc-lib-flag=... option.])
+ fi
fi
AC_SUBST(HAVE_BLOCKS)
@@ -2003,13 +2012,15 @@
if test $non_fragile = yes; then
OBJCLIBS="$OBJLIBS -fobjc-nonfragile-abi"
GS_NONFRAGILE=1
- AC_ARG_ENABLE(mixedabi,
- [ --disable-mixedabi
+ if test "$OBJC_RUNTIME_LIB" != "ng"; then
+ AC_ARG_ENABLE(mixedabi,
+ [ --disable-mixedabi
Disables the combined use of fragile and nonfragile ABI so that base
can be built taking full advantage of the nonfragile ABI.],,
- enable_mixedabi=yes)
- if test $enable_mixedabi = yes; then
- GS_MIXEDABI=1
+ enable_mixedabi=yes)
+ if test $enable_mixedabi = yes; then
+ GS_MIXEDABI=1
+ fi
fi
fi
AC_MSG_RESULT($non_fragile)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
