@@ -370,18 +370,33 @@ PHP_ARG_WITH(iodbc,,
370
370
371
371
if test "$PHP_IODBC" != "no"; then
372
372
AC_MSG_CHECKING ( for iODBC support )
373
- if test "$PHP_IODBC" = "yes"; then
374
- PHP_IODBC=/usr/local
373
+ if test -z "$PKG_CONFIG"; then
374
+ AC_PATH_PROG ( PKG_CONFIG , pkg-config , no )
375
+ fi
376
+ if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
377
+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
378
+ ODBC_TYPE=iodbc
379
+ ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
380
+ ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
381
+ ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
382
+ PHP_EVAL_INCLINE($ODBC_INCLUDE)
383
+ AC_DEFINE ( HAVE_IODBC ,1 ,[ ] )
384
+ AC_DEFINE ( HAVE_ODBC2 ,1 ,[ ] )
385
+ AC_MSG_RESULT ( [ $ext_output] )
386
+ else
387
+ if test "$PHP_IODBC" = "yes"; then
388
+ PHP_IODBC=/usr/local
389
+ fi
390
+ PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
391
+ PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
392
+ ODBC_TYPE=iodbc
393
+ ODBC_INCLUDE=-I$PHP_IODBC/include
394
+ ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
395
+ ODBC_LIBS=-liodbc
396
+ AC_DEFINE ( HAVE_IODBC ,1 ,[ ] )
397
+ AC_DEFINE ( HAVE_ODBC2 ,1 ,[ ] )
398
+ AC_MSG_RESULT ( [ $ext_output] )
375
399
fi
376
- PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
377
- PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
378
- ODBC_TYPE=iodbc
379
- ODBC_INCLUDE=-I$PHP_IODBC/include
380
- ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
381
- ODBC_LIBS=-liodbc
382
- AC_DEFINE ( HAVE_IODBC ,1 ,[ ] )
383
- AC_DEFINE ( HAVE_ODBC2 ,1 ,[ ] )
384
- AC_MSG_RESULT ( [ $ext_output] )
385
400
fi
386
401
fi
387
402
0 commit comments