Changeset 36647 for lang/objective-cplusplus/i3

Timestamp:

02/07/10 18:02:19 (3 years ago)

Author:

saturday06

Message:

s

Files:

• lang/objective-cplusplus/i3/trunk/configure.ac (modified) (9 diffs)

lang/objective-cplusplus/i3/trunk/configure.ac

@@ -19 +19 @@
 
 AC_DEFUN([I3_CHECK_PROGRAM_IFELSE], [
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [
+    AC_COMPILE_IFELSE([$1], [
+        AC_LINK_IFELSE([$1], [
             if test "cross_compiling" = "yes"; then
-                AC_RUN_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])
+                AC_RUN_IFELSE([$1], [$2], [$3])
             else
-                true; $3
+                true; $2
             fi
-        ], [$4])
-    ], [$4])
+        ], [$3])
+    ], [$3])
 ])
 
@@ -34 +34 @@
     CXXFLAGS_ORIG="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS $1"
-    I3_CHECK_PROGRAM_IFELSE([], [],
+    I3_CHECK_PROGRAM_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
                             [AC_MSG_RESULT([yes])],
                             [AC_MSG_RESULT([no]); CXXFLAGS="$CXXFLAGS_ORIG"])
@@ -151 +151 @@
     LDFLAGS="$LDFLAGS -x objective-c++"
 
-    I3_CHECK_PROGRAM_IFELSE([
+    I3_CHECK_PROGRAM_IFELSE([AC_LANG_PROGRAM([[
 #import <Foundation/Foundation.h>
 #import <AppKit/AppKit.h>
@@ -163 +163 @@
 @end
 int result = EXIT_FAILURE;
-    ],
-    [
+    ]],
+    [[
 NS_DURING
 {
@@ -177 +177 @@
 NS_ENDHANDLER;
 return result;
-    ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no])])
+    ]])], [AC_MSG_RESULT([yes])],
+          [AC_MSG_RESULT([no]); AC_MSG_ERROR([Objective-C++ toolset does not work])])
 
     LDFLAGS="$LDFLAGS_ORIG"
@@ -239 +240 @@
 AM_GNU_GETTEXT
 #AC_LANG_POP
-#LIBS="${LIBS} ${LIBINTL}"
+LIBS="${LIBS} ${LIBINTL}"
 
 # ---------------------------------------
@@ -284 +285 @@
 #include <stdlib.h>
 #include <semaphore.h>
-     ]], 
-     [[
+    ]], 
+    [[
 sem_t sem;
 if (sem_init(&sem, 0, 0) == 0) {
@@ -293 +294 @@
     return EXIT_FAILURE;
 }
-     ]])],
+    ]])],
     [AC_MSG_RESULT([yes]); AC_DEFINE(HAVE_UNNAMED_SEMAPHORE, 1, [Unnamed semaphore])],
     [AC_MSG_RESULT([no])],
@@ -392 +393 @@
 
 AC_MSG_CHECKING([run simple test program])
-I3_CHECK_PROGRAM_IFELSE([
+I3_CHECK_PROGRAM_IFELSE(AC_LANG_PROGRAM([[
 #include <boost/pool/pool.hpp>
 #include <stdlib.h>
 #include <cstdio>
 #include <iostream>
-],
-[
+]],
+[[
 boost::pool<> p(10);
-], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no])])
+]]), [AC_MSG_RESULT([yes])], 
+     [AC_MSG_RESULT([no]); AC_MSG_ERROR([simple test program does not work])])