From: Jani Taskinen <jani@php.net>
Date: Tue, 17 Jul 2007 12:12:26 +0000 (+0000)
Subject: MFH:- Fixed bug #42019 (configure option --with-adabas=DIR does not work)
X-Git-Tag: php-5.2.4RC1~130
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=addd47150160109c09096d62e15101c73099f422;p=php

MFH:- Fixed bug #42019 (configure option --with-adabas=DIR does not work)
---

diff --git a/NEWS b/NEWS
index d291fadc9e..72922d7694 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,7 @@ PHP                                                                        NEWS
 - Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory 
   already exists). (Pierre)
 
+- Fixed bug #42019 (configure option --with-adabas=DIR does not work). (Jani)
 - Fixed bug #42015 (ldap_rename(): server error "DSA is unwilling to perform").
   (bob at mroczka dot com, Jani)
 - Fixed bug #41964 (strtotime returns a timestamp for non-time string of
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 26e2f1f43d..95223cc336 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -119,6 +119,7 @@ PHP_ARG_WITH(adabas,,
     PHP_ADD_LIBRARY(sqlrte)
     PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc)
     ODBC_TYPE=adabas
+    ODBC_INCDIR=$PHP_ADABAS/incl
     PHP_ODBC_CHECK_HEADER(sqlext.h)
     AC_DEFINE(HAVE_ADABAS,1,[ ])
     AC_MSG_RESULT([$ext_output])