diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-05-12 18:51:50 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-05-12 18:51:50 +0200 |
| commit | 2cf90bb2f006e2973b666426b18596e2e67ccfd9 (patch) | |
| tree | 119e06295fd516d1dbf2ecf3c316b6ab7af7c67c /ext/odbc | |
| parent | 3005d6c21d8a4d6115a8159934b604e10b8a1136 (diff) | |
| parent | 75fb74860da7decd94432a4d211795310308a4a8 (diff) | |
| download | php-git-2cf90bb2f006e2973b666426b18596e2e67ccfd9.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Normalize comments in *nix build system m4 files
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/config.m4 | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index a96d8c0345..792aaef5bb 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -1,5 +1,3 @@ -dnl config.m4 for extension odbc - AC_DEFUN([PHP_ODBC_CHECK_HEADER],[ if ! test -f "$ODBC_INCDIR/$1"; then AC_MSG_ERROR([ODBC header file '$ODBC_INCDIR/$1' not found!]) @@ -48,14 +46,10 @@ AC_DEFUN([PHP_ODBC_FIND_SOLID_LIBS],[ ac_solid_prefix=scl fi -# -# Check for the library files, and setup the ODBC_LIBS path... -# +dnl Check for the library files, and setup the ODBC_LIBS path. if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \ ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then - # - # we have an error and should bail out, as we can't find the libs! - # + dnl we have an error and should bail out, as we can't find the libs! echo "" echo "*********************************************************************" echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" @@ -393,10 +387,10 @@ PHP_ARG_WITH([dbmaker],, AC_MSG_CHECKING(for DBMaker support) if test "$PHP_DBMAKER" != "no"; then if test "$PHP_DBMAKER" = "yes"; then - # find dbmaker's home directory + dnl Find dbmaker's home directory DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` - # check DBMaker version (from 5.0 to 2.0) + dnl check DBMaker version (from 5.0 to 2.0) DBMAKER_VERSION=5.0 while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" != "2.9"; do @@ -445,10 +439,7 @@ else AC_DEFINE(ODBCVER, 0x0300, [ The highest supported ODBC version ]) fi - -dnl dnl Extension setup -dnl if test -n "$ODBC_TYPE"; then if test "$ODBC_TYPE" != "dbmaker"; then PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD) |