Use PKG_CHECK_MODULES to detect the iODBC library

diff --git a/UPGRADING b/UPGRADING
index 4ccbc38c0dabb9895b99f5868de2cc4ef47ad648..6e7a69b5a2b91b62353f43c2f994c8c6cf27d4e6 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -522,6 +522,9 @@ The following extensions and SAPIs are affected:
   . --with-libxml-dir has been removed.
   . --enable-libxml becomes --with-libxml.
 
+- ODBC:
+  . --with-iodbc no longer accepts a directory.
+
 - Sodium:
   . --with-sodium no longer accepts a directory.
 

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 6ded84c5abd966b5c44c6ed267a6bfcb77a1459f..a96d8c034505e1e399cdbf74d81ce73c0d5a643e 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -168,7 +168,7 @@ PHP_ARG_WITH([solid],,
     fi
     ODBC_INCDIR=$PHP_SOLID/include
     ODBC_LIBDIR=$PHP_SOLID/$PHP_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
       AC_DEFINE(HAVE_SOLID_35,1,[ ])
@@ -201,7 +201,7 @@ PHP_ARG_WITH([ibm-db2],,
 
     PHP_ODBC_CHECK_HEADER(sqlcli1.h)
 
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=ibm-db2
     ODBC_LIBS=-ldb2
@@ -239,7 +239,7 @@ PHP_ARG_WITH([empress],,
       ODBC_INCDIR=$PHP_EMPRESS/include/odbc
       ODBC_LIBDIR=$PHP_EMPRESS/shlib
     fi
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=empress
     AC_DEFINE(HAVE_EMPRESS,1,[ ])
@@ -267,7 +267,7 @@ PHP_ARG_WITH([empress-bcs],,
     fi
     CC="empocc -bcs";export CC;
     LD="empocc -bcs";export LD;
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     LIST=`empocc -listlines -bcs -o a a.c`
 
@@ -310,7 +310,7 @@ PHP_ARG_WITH([custom-odbc],,
     ODBC_INCDIR=$PHP_CUSTOM_ODBC/include
     ODBC_LIBDIR=$PHP_CUSTOM_ODBC/$PHP_LIBDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
     AC_DEFINE(HAVE_CODBC,1,[ ])
@@ -322,35 +322,17 @@ fi
 
 if test -z "$ODBC_TYPE"; then
 PHP_ARG_WITH([iodbc],,
-  [AS_HELP_STRING([[--with-iodbc[=DIR]]],
-    [Include iODBC support [/usr/local]])])
+  [AS_HELP_STRING([--with-iodbc],
+    [Include iODBC support])])
 
-  AC_MSG_CHECKING(for iODBC support)
+  AC_MSG_CHECKING(whether to build with iODBC support)
   if test "$PHP_IODBC" != "no"; then
-    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-      ODBC_TYPE=iodbc
-      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
-      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
-      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
-      PHP_EVAL_INCLINE($ODBC_INCLUDE)
-      AC_DEFINE(HAVE_IODBC,1,[ ])
-      AC_DEFINE(HAVE_ODBC2,1,[ ])
-      AC_MSG_RESULT([$ext_output])
-    else
-      if test "$PHP_IODBC" = "yes"; then
-        PHP_IODBC=/usr/local
-      fi
-      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
-      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
-      ODBC_TYPE=iodbc
-      ODBC_INCLUDE=-I$PHP_IODBC/include
-      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
-      ODBC_LIBS=-liodbc
-      AC_DEFINE(HAVE_IODBC,1,[ ])
-      AC_DEFINE(HAVE_ODBC2,1,[ ])
-      AC_MSG_RESULT([$ext_output])
-    fi
+    AC_MSG_RESULT(yes)
+    PKG_CHECK_MODULES([ODBC], [libiodbc])
+    PHP_EVAL_INCLINE($ODBC_CFLAGS)
+    ODBC_TYPE=iodbc
+    AC_DEFINE(HAVE_IODBC,1,[ ])
+    AC_DEFINE(HAVE_ODBC2,1,[ ])
   else
     AC_MSG_RESULT(no)
   fi
@@ -369,7 +351,7 @@ PHP_ARG_WITH([esoob],,
     ODBC_INCDIR=$PHP_ESOOB/include
     ODBC_LIBDIR=$PHP_ESOOB/$PHP_LIBDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=esoob
     AC_DEFINE(HAVE_ESOOB,1,[ ])
@@ -392,7 +374,7 @@ PHP_ARG_WITH([unixODBC],,
     ODBC_INCDIR=$PHP_UNIXODBC/include
     ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LIBS=-lodbc
     ODBC_TYPE=unixODBC
     PHP_ODBC_CHECK_HEADER(sqlext.h)
@@ -433,9 +415,8 @@ PHP_ARG_WITH([dbmaker],,
 
     ODBC_INCDIR=$PHP_DBMAKER/include
     ODBC_LIBDIR=$PHP_DBMAKER/$PHP_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
+    ODBC_CFLAGS=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
-    ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LIBS="-ldmapic -lc"
     ODBC_TYPE=dbmaker
 
@@ -480,12 +461,12 @@ if test -n "$ODBC_TYPE"; then
   PHP_SUBST(ODBC_SHARED_LIBADD)
   PHP_SUBST(ODBC_INCDIR)
   PHP_SUBST(ODBC_LIBDIR)
-  PHP_SUBST_OLD(ODBC_INCLUDE)
+  PHP_SUBST_OLD(ODBC_CFLAGS)
   PHP_SUBST_OLD(ODBC_LIBS)
   PHP_SUBST_OLD(ODBC_LFLAGS)
   PHP_SUBST_OLD(ODBC_TYPE)
 
-  PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, [$ODBC_INCLUDE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
+  PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, [$ODBC_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 else
   AC_MSG_CHECKING([for any ODBC driver support])
   AC_MSG_RESULT(no)

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 35da5a48a2f220470246a30d41390c661f814f0f..c37d3a49299209546ccc2fe29342cf666540d9b3 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -856,7 +856,7 @@ PHP_MINFO_FUNCTION(odbc)
        php_info_print_table_row(2, "ODBCVER", buf);
 #endif
 #ifndef PHP_WIN32
-       php_info_print_table_row(2, "ODBC_INCLUDE", PHP_ODBC_INCLUDE);
+       php_info_print_table_row(2, "ODBC_CFLAGS", PHP_ODBC_CFLAGS);
        php_info_print_table_row(2, "ODBC_LFLAGS", PHP_ODBC_LFLAGS);
        php_info_print_table_row(2, "ODBC_LIBS", PHP_ODBC_LIBS);
 #endif

diff --git a/main/build-defs.h.in b/main/build-defs.h.in
index 124c357128f26c5c1be2f50450baeed5f447408e..de17ba0d2e1d7a2f95bbcb373c6b4bba0609dfcb 100644 (file)
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@ -45,7 +45,7 @@
 #define PHP_MYSQL_INCLUDE      "@MYSQL_INCLUDE@"
 #define PHP_MYSQL_LIBS         "@MYSQL_LIBS@"
 #define PHP_MYSQL_TYPE         "@MYSQL_MODULE_TYPE@"
-#define PHP_ODBC_INCLUDE       "@ODBC_INCLUDE@"
+#define PHP_ODBC_CFLAGS        "@ODBC_CFLAGS@"
 #define PHP_ODBC_LFLAGS                "@ODBC_LFLAGS@"
 #define PHP_ODBC_LIBS          "@ODBC_LIBS@"
 #define PHP_ODBC_TYPE          "@ODBC_TYPE@"