dev-lang/php/files/iodbc-pkgconfig-r1.patch

   1 --- ext/odbc/config.m4.old      2013-04-06 11:26:04.047017826 +0200
   2 +++ ext/odbc/config.m4  2013-04-06 12:29:47.180617161 +0200
   3 @@ -366,22 +366,37 @@
   4
   5  if test -z "$ODBC_TYPE"; then
   6  PHP_ARG_WITH(iodbc,,
   7 -[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
   8 +[  --with-iodbc[=DIR]        Include iODBC support])
   9
  10    if test "$PHP_IODBC" != "no"; then
  11      AC_MSG_CHECKING(for iODBC support)
  12 -    if test "$PHP_IODBC" = "yes"; then
  13 -      PHP_IODBC=/usr/local
  14 +    if test -z "$PKG_CONFIG"; then
  15 +      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
  16 +    fi
  17 +    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libiodbc ; then
  18 +      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
  19 +      ODBC_TYPE=iodbc
  20 +      ODBC_INCLUDE=`$PKG_CONFIG --cflags-only-I libiodbc`
  21 +      ODBC_LFLAGS=`$PKG_CONFIG --libs-only-L libiodbc`
  22 +      ODBC_LIBS=`$PKG_CONFIG --libs-only-l libiodbc`
  23 +      PHP_EVAL_INCLINE($ODBC_INCLUDE)
  24 +      AC_DEFINE(HAVE_IODBC,1,[ ])
  25 +      AC_DEFINE(HAVE_ODBC2,1,[ ])
  26 +      AC_MSG_RESULT([$ext_output])
  27 +    else
  28 +      if test "$PHP_IODBC" = "yes"; then
  29 +        PHP_IODBC=/usr/local
  30 +      fi
  31 +      PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
  32 +      PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
  33 +      ODBC_TYPE=iodbc
  34 +      ODBC_INCLUDE=-I$PHP_IODBC/include
  35 +      ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
  36 +      ODBC_LIBS=-liodbc
  37 +      AC_DEFINE(HAVE_IODBC,1,[ ])
  38 +      AC_DEFINE(HAVE_ODBC2,1,[ ])
  39 +      AC_MSG_RESULT([$ext_output])
  40      fi
  41 -    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $PHP_IODBC/$PHP_LIBDIR)
  42 -    PHP_ADD_INCLUDE($PHP_IODBC/include, 1)
  43 -    ODBC_TYPE=iodbc
  44 -    ODBC_INCLUDE=-I$PHP_IODBC/include
  45 -    ODBC_LFLAGS=-L$PHP_IODBC/$PHP_LIBDIR
  46 -    ODBC_LIBS=-liodbc
  47 -    AC_DEFINE(HAVE_IODBC,1,[ ])
  48 -    AC_DEFINE(HAVE_ODBC2,1,[ ])
  49 -    AC_MSG_RESULT([$ext_output])
  50    fi
  51  fi
  52