Connector/ODBC 3.51 commit: r436 - trunk

[kboortz]

Modified:
   trunk/acinclude.m4
   trunk/configure.in
Log:
Removed code that added -isystem when gcc 3, flag was added
incorrectly without argument so could not have worked anyway.


Modified: trunk/acinclude.m4
===================================================================
--- trunk/acinclude.m4	2007-05-22 23:59:33 UTC (rev 435)
+++ trunk/acinclude.m4	2007-05-25 02:54:42 UTC (rev 436)
@@ -91,7 +91,7 @@
 [
 check_iobc_inc_path="$1"
 check_iobc_lib_path="$2"
-CPPFLAGS="$CPPFLAGS $ODBC_FLAGS -I$check_iobc_inc_path"
+CPPFLAGS="$CPPFLAGS -I$check_iobc_inc_path"
 AC_CHECK_HEADERS([isql.h isqlext.h isqltypes.h],
 [iodbc_ok=yes;odbc_headers="$odbc_headers $ac_hdr"],[iodbc_ok=no; break])
 
@@ -148,7 +148,7 @@
 [
 check_iobc_inc_path="$1"
 check_iobc_lib_path="$2"
-CPPFLAGS="$CPPFLAGS $ODBC_FLAGS -I$check_iobc_inc_path"
+CPPFLAGS="$CPPFLAGS -I$check_iobc_inc_path"
 AC_CHECK_HEADERS([sql.h sqlext.h sqltypes.h],
 [unixODBC_ok=yes;odbc_headers="$odbc_headers $ac_hdr"],[unixODBC_ok=no; break])
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2007-05-22 23:59:33 UTC (rev 435)
+++ trunk/configure.in	2007-05-25 02:54:42 UTC (rev 436)
@@ -365,29 +365,6 @@
 
 export CC CFLAGS LD LDFLAGS
 
-# To avoid configure to fail when used with gcc 3.x along with
-# iodbc/unixodbc search path in system directories; add -isystem
-# to CFLAGS
-
-using_gcc_3x=no
-if test "$CC" = "gcc" 
-then
-  AC_MSG_CHECKING([if we are using gcc >= 3.x])
-  gcc_version=`${CC} --version | head -n 1`
-  case "$gcc_version" in
-      "gcc (GCC) 3."*)
-    using_gcc_3x=yes;
-  esac  
-
-  if test "$using_gcc_3x" = "yes" 
-  then
-    AC_MSG_RESULT([yes (${gcc_version})])
-  else 
-    AC_MSG_RESULT([no (${gcc_version})])
-  fi
-fi
-
-
 ###################################################################
 #                                                                 #
 # Check if localtime_r exists in libc or not                      #
@@ -530,22 +507,6 @@
 [  --with-iodbc-libs=DIR   Find iODBC libraries in DIR],
 iodbc_libs="$withval",iodbc_libs="$iodbc/lib")
 
-
-# if gcc 3.x used, and system search paths specified for 
-# unixodbc / iodbc, then overcome the gcc error by specifying
-# -isystem
-
-if test "$using_gcc_3x" = "yes"
-then
-  if test "x$iodbc" = "x/usr" ||
-     test "x$iodbc" = "x/usr/" ||
-     test "x$iodbc" = "x/usr/local" ||
-     test "x$iodbc" = "x/usr/local/"
-   then
-     ODBC_FLAGS="-isystem"
-  fi
-fi
-
 # add iodbc version
 AC_PATH_PROG(iodbc_conf,iodbc-config,no)
 if test "$iodbc_conf" != "no"
@@ -606,21 +567,6 @@
 AC_MSG_CHECKING([for unixODBC version])
 AC_MSG_RESULT([$unixodbc_version])
 
-# if gcc 3.x used, and system search paths specified for 
-# unixodbc / iodbc, then overcome the gcc error by specifying
-# -isystem
-
-if test "$using_gcc_3x" = "yes"
-then
-  if test "x$unixODBC" = "x/usr" ||
-     test "x$unixODBC" = "x/usr/" ||
-     test "x$unixODBC" = "x/usr/local" ||
-     test "x$unixODBC" = "x/usr/local/"
-   then
-     ODBC_FLAGS="-isystem"
-  fi
-fi
-
 AC_ARG_WITH(unixODBC-includes,
 [  --with-unixODBC-includes=DIR Find unixODBC headers in DIR],
 unixODBC_includes="$withval",unixODBC_includes="$unixODBC/include")