[Stdair-svn] SF.net SVN: stdair:[395] trunk/stdair/config

[<den...@us...>]

Revision: 395
          http://stdair.svn.sourceforge.net/stdair/?rev=395&view=rev
Author:   denis_arnaud
Date:     2011-07-03 16:39:45 +0000 (Sun, 03 Jul 2011)

Log Message:
-----------
[Build] Updated the GNU Autotools scripts for the new autoconf version (2.68).

Modified Paths:
--------------
    trunk/stdair/config/ax_boost_date_time.m4
    trunk/stdair/config/ax_firebird.m4
    trunk/stdair/config/ax_odbc.m4
    trunk/stdair/config/ax_oracle_oci.m4
    trunk/stdair/config/ax_sqlite3.m4

Modified: trunk/stdair/config/ax_boost_date_time.m4
===================================================================
--- trunk/stdair/config/ax_boost_date_time.m4	2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_boost_date_time.m4	2011-07-03 16:39:45 UTC (rev 395)
@@ -21,9 +21,9 @@
 ax_cv_boost_date_time,
 [AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
- AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include <boost/date_time/gregorian/gregorian_types.hpp>]],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <boost/date_time/gregorian/gregorian_types.hpp>]],
 			           [[using namespace boost::gregorian; date d(2002,Jan,10); return 0;]]),
-  	           ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)
+  	           ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no)]
  AC_LANG_RESTORE
 ])
 if test "$ax_cv_boost_date_time" = yes; then

Modified: trunk/stdair/config/ax_firebird.m4
===================================================================
--- trunk/stdair/config/ax_firebird.m4	2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_firebird.m4	2011-07-03 16:39:45 UTC (rev 395)
@@ -110,8 +110,7 @@
 
             AC_LANG_PUSH(C++)
             AC_COMPILE_IFELSE(
-                [
-                AC_LANG_PROGRAM([[@%:@include <ibase.h>]],
+                [AC_LANG_PROGRAM([[@%:@include <ibase.h>]],
                     [[
 #if (FB_API_VER >= $firebird_version_req_number)
 // Everything is okay
@@ -119,8 +118,12 @@
 #  error Firebird version is too old
 #endif
                     ]]
+<<<<<<< HEAD
                 )
                 ],
+=======
+                )],
+>>>>>>> trunk
                 [
                 AC_MSG_RESULT([yes])
                 success="yes"

Modified: trunk/stdair/config/ax_odbc.m4
===================================================================
--- trunk/stdair/config/ax_odbc.m4	2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_odbc.m4	2011-07-03 16:39:45 UTC (rev 395)
@@ -82,8 +82,7 @@
 
         AC_LANG_PUSH(C++)
         AC_COMPILE_IFELSE(
-            [
-            AC_LANG_PROGRAM([[@%:@include <sql.h>]],
+            [AC_LANG_PROGRAM([[@%:@include <sql.h>]],
                 [[
 #if (ODBCVER >= $odbc_version_req)
 // Everything is okay
@@ -91,8 +90,7 @@
 #  error ODBC version is too old
 #endif
                 ]]
-            )
-            ],
+            )],
             [
             AC_MSG_RESULT([yes])
             success="yes"

Modified: trunk/stdair/config/ax_oracle_oci.m4
===================================================================
--- trunk/stdair/config/ax_oracle_oci.m4	2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_oracle_oci.m4	2011-07-03 16:39:45 UTC (rev 395)
@@ -163,8 +163,8 @@
         AC_MSG_CHECKING([for Oracle OCI headers in $oracle_include_dir])
 
         AC_LANG_PUSH(C++)
-        AC_COMPILE_IFELSE([
-            AC_LANG_PROGRAM([[@%:@include <oci.h>]],
+        AC_COMPILE_IFELSE(
+				[AC_LANG_PROGRAM([[@%:@include <oci.h>]],
                 [[
 #if defined(OCI_MAJOR_VERSION)
 #if OCI_MAJOR_VERSION == 10 && OCI_MINOR_VERSION == 2
@@ -203,8 +203,8 @@
             AC_MSG_CHECKING([for Oracle OCI libraries in $oracle_lib_dir])
 
             AC_LANG_PUSH(C++)
-            AC_LINK_IFELSE([
-                AC_LANG_PROGRAM([[@%:@include <oci.h>]],
+            AC_LINK_IFELSE(
+				[AC_LANG_PROGRAM([[@%:@include <oci.h>]],
                     [[
 OCIEnv* envh = 0;
 OCIEnvCreate(&envh, OCI_DEFAULT, 0, 0, 0, 0, 0, 0);

Modified: trunk/stdair/config/ax_sqlite3.m4
===================================================================
--- trunk/stdair/config/ax_sqlite3.m4	2011-07-03 16:23:06 UTC (rev 394)
+++ trunk/stdair/config/ax_sqlite3.m4	2011-07-03 16:39:45 UTC (rev 395)
@@ -95,8 +95,7 @@
 
         AC_LANG_PUSH(C++)
         AC_COMPILE_IFELSE(
-            [
-            AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
+            [AC_LANG_PROGRAM([[@%:@include <sqlite3.h>]],
                 [[
 #if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number)
 // Everything is okay
@@ -104,8 +103,7 @@
 #  error SQLite version is too old
 #endif
                 ]]
-            )
-            ],
+            )],
             [
             AC_MSG_RESULT([yes])
             success="yes"


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