MFH

php · Jun 1, 2001 · 8fd4280 · 8fd4280
1 parent 82bf518
commit 8fd4280
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
@@ -1,3 +1,5 @@
+dnl $Id$
+
 dnl
 dnl Figure out which library file to link with for the Solid support.
 dnl
@@ -366,6 +368,9 @@ AC_ARG_WITH(iodbc,
     PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
     PHP_ADD_INCLUDE($withval/include)
     ODBC_TYPE=iodbc
+    ODBC_INCLUDE=-I$withval/include
+    ODBC_LFLAGS=-L$withval/lib
+    ODBC_LIBS=-liodbc
     AC_DEFINE(HAVE_IODBC,1,[ ])
     AC_MSG_RESULT(yes)
   else
@@ -533,10 +538,10 @@ if test -n "$ODBC_TYPE"; then
   fi
   AC_DEFINE(HAVE_UODBC,1,[ ])
   PHP_SUBST(ODBC_INCDIR)
-  PHP_SUBST(ODBC_INCLUDE)
   PHP_SUBST(ODBC_LIBDIR)
-  PHP_SUBST(ODBC_LIBS)
-  PHP_SUBST(ODBC_LFLAGS)
+  PHP_SUBST_OLD(ODBC_INCLUDE)
+  PHP_SUBST_OLD(ODBC_LIBS)
+  PHP_SUBST_OLD(ODBC_LFLAGS)
   PHP_SUBST_OLD(ODBC_TYPE)
   PHP_EXTENSION(odbc, $shared)
 fi
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
@@ -259,6 +259,8 @@ static PHP_INI_DISP(display_defPW)
 #else
 		PUTS("********");
 #endif
+	} else {
+		PUTS("<i>no value</i>");
 	}
 }