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

diff --git a/NEWS b/NEWS
index d291fadc9ed825da2106585e8d8c441100135f9f..72922d76946cbdfb3a354d793368e4d851262613 100644 (file)
--- 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 26e2f1f43db139431118931b643ecbb1b5b3d21f..95223cc336527eefceda1440c424a09511a6c7ed 100644 (file)
--- 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])