From: foobar <sniper@php.net>
Date: Tue, 8 Jan 2002 17:51:08 +0000 (+0000)
Subject: Some whitespace fixes (naugthy me :) and make use of PHP_CHECK_LIBRARY
X-Git-Tag: PRE_ISSET_PATCH~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a41ee123df42c919a1bdff4f6b449ded9cacc5b6;p=php

Some whitespace fixes (naugthy me :) and make use of PHP_CHECK_LIBRARY
macro instead of AC_CHECK_LIB.

# Better not touch LIBS anywhere. It might cause unexpected build problems
# if someone forgets to set it back in some config.m4..
---

diff --git a/ext/ext_skel b/ext/ext_skel
index c3be97c708..0cde813344 100755
--- a/ext/ext_skel
+++ b/ext/ext_skel
@@ -118,7 +118,7 @@ if test "\$PHP_$EXTNAME" != "no"; then
   dnl Write more examples of tests here...
 
   dnl # --with-$extname -> check with-path
-	dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
+  dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
   dnl SEARCH_FOR="/include/$extname.h"  # you most likely want to change this
   dnl if test -r \$PHP_$EXTNAME/$SEARCH_FOR; then # path given as parameter
   dnl   ${EXTNAME}_DIR=\$PHP_$EXTNAME
@@ -143,14 +143,18 @@ if test "\$PHP_$EXTNAME" != "no"; then
   dnl # --with-$extname -> chech for lib and symbol presence
   dnl LIBNAME=$extname # you may want to change this
   dnl LIBSYMBOL=$extname # you most likely want to change this 
-  dnl old_LIBS=\$LIBS
-  dnl LIBS="\$LIBS -L\$${EXTNAME}_DIR/lib -lm -ldl"
-  dnl AC_CHECK_LIB(\$LIBNAME, \$LIBSYMBOL, [AC_DEFINE(HAVE_${EXTNAME}LIB,1,[ ])],
-	dnl			[AC_MSG_ERROR([wrong $extname lib version or lib not found])])
-  dnl LIBS=\$old_LIBS
+
+  dnl PHP_CHECK_LIBRARY(\$LIBNAME,\$LIBSYMBOL,
+  dnl [
+  dnl   PHP_ADD_LIBRARY_WITH_PATH(\$LIBNAME, \$${EXTNAME}_DIR/lib, ${EXTNAME}_SHARED_LIBADD)
+  dnl   AC_DEFINE(HAVE_${EXTNAME}LIB,1,[ ])
+  dnl ],[
+  dnl   AC_MSG_ERROR([wrong $extname lib version or lib not found])
+  dnl ],[
+  dnl   -L\$${EXTNAME}_DIR/lib -lm -ldl
+  dnl ])
   dnl
   dnl PHP_SUBST(${EXTNAME}_SHARED_LIBADD)
-  dnl PHP_ADD_LIBRARY_WITH_PATH(\$LIBNAME, \$${EXTNAME}_DIR/lib, ${EXTNAME}_SHARED_LIBADD)
 
   PHP_EXTENSION($extname, \$ext_shared)
 fi
@@ -160,10 +164,10 @@ $ECHO_N " Makefile.in$ECHO_C"
 cat >Makefile.in <<eof
 # \$Id\$
 
-LTLIBRARY_NAME        = lib$extname.la
-LTLIBRARY_SOURCES     = $extname.c
-LTLIBRARY_SHARED_NAME = $extname.la
-LTLIBRARY_SHARED_LIBADD  = \$(${EXTNAME}_SHARED_LIBADD)
+LTLIBRARY_NAME          = lib$extname.la
+LTLIBRARY_SOURCES       = $extname.c
+LTLIBRARY_SHARED_NAME   = $extname.la
+LTLIBRARY_SHARED_LIBADD = \$(${EXTNAME}_SHARED_LIBADD)
 
 include \$(top_srcdir)/build/dynlib.mk
 eof