X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mjo-overlay.git;a=blobdiff_plain;f=dev-lang%2Fphp%2Ffiles%2Fiodbc-pkgconfig-r1.patch;fp=dev-lang%2Fphp%2Ffiles%2Fiodbc-pkgconfig-r1.patch;h=0000000000000000000000000000000000000000;hp=b2159845008f643eeb1f0c05aecc219dfe7db08c;hb=c8f916f066225037a9e3c7d85f5529ac3dce359d;hpb=3159f43d1af846567d1b5c6bec4fbbfa0e62b1bf

diff --git a/dev-lang/php/files/iodbc-pkgconfig-r1.patch b/dev-lang/php/files/iodbc-pkgconfig-r1.patch
deleted file mode 100644
index b215984..0000000
--- a/dev-lang/php/files/iodbc-pkgconfig-r1.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- ext/odbc/config.m4.old	2013-04-06 11:26:04.047017826 +0200
-+++ ext/odbc/config.m4	2013-04-06 12:29:47.180617161 +0200
-@@ -366,22 +366,37 @@
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
-+[  --with-iodbc[=DIR]        Include iODBC support])
- 
-   if test "$PHP_IODBC" != "no"; then
-     AC_MSG_CHECKING(for iODBC support)
--    if test "$PHP_IODBC" = "yes"; then
--      PHP_IODBC=/usr/local
-+    if test -z "$PKG_CONFIG"; then
-+      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+    fi 
-+    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
--    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
- fi
-