[Substrate-commits] SF.net SVN: substrate: [283] trunk

[<la...@us...>]

Revision: 283
          http://svn.sourceforge.net/substrate/?rev=283&view=rev
Author:   landonf
Date:     2006-08-31 15:35:54 -0700 (Thu, 31 Aug 2006)

Log Message:
-----------
 r5716@zadder:  landonf | 2006-08-31 15:35:22 -0700
 Unbreak objc exception autoconf macros

Modified Paths:
--------------
    trunk/aclocal.m4
    trunk/configure.ac

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 11572a18-12fc-0310-9209-f8edcc8181a7:/local/substrate/trunk:5713
   + 11572a18-12fc-0310-9209-f8edcc8181a7:/local/substrate/trunk:5716

Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	2006-08-31 22:26:28 UTC (rev 282)
+++ trunk/aclocal.m4	2006-08-31 22:35:54 UTC (rev 283)
@@ -313,7 +313,8 @@
 # Results:
 #	Result is cached.
 #	Substitutes OBJC_EXCEPTIONS_DEFINE and OBJC_EXCEPTIONS_CFLAGS
-#	If enabled, OBJC_EXCEPTIONS is defined to 1.
+#	If enabled, OBJC_EXCEPTIONS is defined to 1, and OBJC_EXCEPTIONS
+#       variable is set to "yes"
 #------------------------------------------------------------------------
 AC_DEFUN([OD_OBJC_EXCEPTIONS],[
 	AC_REQUIRE([AC_PROG_OBJC])
@@ -345,11 +346,13 @@
 
 	# If we can enable exceptions, do we want to?
 	if test x"$ac_cv_objc_exceptions" = "xyes" && test x"$ac_cv_objc_fobjc_exceptions" = "xyes"; then
+		OBJC_EXCEPTIONS="yes"
 		OBJC_EXCEPTIONS_CFLAGS="-fobjc-exceptions"
-		OBJC_EXCEPTIONS_DEFINE="#define OBJC_EXCEPTIONS 1"
+		OBJC_EXCEPTIONS_DEFINE="\\#define OBJC_EXCEPTIONS 1"
 	else
+		OBJC_EXCEPTIONS="no"
 		OBJC_EXCEPTIONS_CFLAGS=""
-		OBJC_EXCEPTIONS_DEFINE=""
+		OBJC_EXCEPTIONS_DEFINE="/* \\#undef OBJC_EXCEPTIONS */"
 	fi
 
 	AC_SUBST([OBJC_EXCEPTIONS_CFLAGS])

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-08-31 22:26:28 UTC (rev 282)
+++ trunk/configure.ac	2006-08-31 22:35:54 UTC (rev 283)
@@ -59,7 +59,7 @@
 OD_OBJC_EXCEPTIONS
 # Check whether -fno-constant-cfstrings is supported
 OD_OBJC_NOCFCONSTANTSTRING
-if test x"$OBJC_EXCEPTIONS_DEFINE" != "x"; then
+if test x"$OBJC_EXCEPTIONS" = "xyes"; then
 		AC_MSG_NOTICE([Objective-C exception handling: @try @catch @throw])
 else
 		AC_MSG_NOTICE([Exception handling: NS_DURING NS_HANDLER])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.