[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Changes to work with GNUstep
From: |
Germán Arias |
Subject: |
[PATCH] Changes to work with GNUstep |
Date: |
Tue, 23 Aug 2011 17:54:27 -0600 |
Below is a patch to configure and compile with latest gnustep packages.
Let me know if this is OK or I need change something.
This patch define _NATIVE_OBJC_EXCEPTIONS, that is needed to build
gnustep's apps without using gnustep-make. And add the flags to found
the gnustep headers. Necessary if gnustep is installed with gnustep
layout instead FHS.
=== modified file 'configure.in'
*** configure.in 2011-08-13 10:48:03 +0000
--- configure.in 2011-08-16 01:14:52 +0000
*************** test "X${with_gnustep_conf}" != X && tes
*** 219,224 ****
--- 219,232 ----
test "X$GNUSTEP_CONFIG_FILE" = "X" && \
GNUSTEP_CONFIG_FILE=/etc/GNUstep/GNUstep.conf
+ GS_LOCAL_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo
$GNUSTEP_LOCAL_HEADERS)"
+
+ if grep "BASE_NATIVE_OBJC_EXCEPTIONS 1"
${GS_LOCAL_HEADERS}/GNUstepBase/GSConfig.h; then
+ AC_DEFINE(_NATIVE_OBJC_EXCEPTIONS, 1, [Synchronize native exceptions
with gnustep-base.])
+ else
+ AC_DEFINE(_NATIVE_OBJC_EXCEPTIONS, 0, [Synchronize native exceptions
with gnustep-base.])
+ fi
+
AC_ARG_ENABLE(ns-self-contained,
[AS_HELP_STRING([--disable-ns-self-contained],
[disable self contained build under NeXTstep])],
*************** tmp_CFLAGS="$CFLAGS"
*** 1499,1504 ****
--- 1507,1515 ----
CPPFLAGS="$CPPFLAGS -x objective-c"
CFLAGS="$CFLAGS -x objective-c"
TEMACS_LDFLAGS2="\${LDFLAGS}"
+ if _NATIVE_OBJC_EXCEPTIONS=1; then
+ CFLAGS="$CFLAGS -fobjc-exceptions"
+ fi
dnl I don't think it's especially important, but src/Makefile.in
dnl (now the only user of ns_appdir) used to go to the trouble of
adding a
dnl trailing "/" to it, so now we do it here.
*************** if test "${HAVE_NS}" = "yes"; then
*** 2571,2578 ****
AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS
windowing under GNUstep.])
# See also .m.o rule in Makefile.in */
# FIXME: are all these flags really needed? Document here why.
*/
! C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing"
GNU_OBJC_CFLAGS="-fgnu-runtime -Wno-import
-fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1
-DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
fi
if test "${NS_HAVE_NSINTEGER}" = "yes"; then
AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is
defined.])
--- 2582,2592 ----
AC_DEFINE(NS_IMPL_GNUSTEP, 1, [Define to 1 if you are using NS
windowing under GNUstep.])
# See also .m.o rule in Makefile.in */
# FIXME: are all these flags really needed? Document here why.
*/
! C_SWITCH_X_SYSTEM="-D_REENTRANT -fPIC -fno-strict-aliasing -I
${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
GNU_OBJC_CFLAGS="-fgnu-runtime -Wno-import
-fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1
-DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
+ if _NATIVE_OBJC_EXCEPTIONS=1; then
+ GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fobjc-exceptions"
+ fi
fi
if test "${NS_HAVE_NSINTEGER}" = "yes"; then
AC_DEFINE(NS_HAVE_NSINTEGER, 1, [Define to 1 if `NSInteger' is
defined.])
- [PATCH] Changes to work with GNUstep,
Germán Arias <=