cvs: pecl /chasen config.m4
| From: | Moriyoshi Koizumi | Date: | Sun, 10 Aug 2003 08:25:09 +0000 |
| Subject: | cvs: pecl /chasen config.m4 | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-413@lists.php.net to get a copy of this message | ||
moriyoshi Sun Aug 10 04:25:09 2003 EDT
Modified files:
/pecl/chasen config.m4
Log:
Improve libchasen detection script by using chasen-config script provided
on chasen installation
Index: pecl/chasen/config.m4
diff -u pecl/chasen/config.m4:1.2 pecl/chasen/config.m4:1.3
--- pecl/chasen/config.m4:1.2 Tue Jan 7 23:36:33 2003
+++ pecl/chasen/config.m4 Sun Aug 10 04:25:09 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 2003/01/08 04:36:33 yohgaki Exp $
+dnl $Id: config.m4,v 1.3 2003/08/10 08:25:09 moriyoshi Exp $
dnl config.m4 for extension chasen
PHP_ARG_WITH(chasen, for chasen support,
@@ -6,32 +6,47 @@
library directory.])
if test "$PHP_CHASEN" != "no"; then
- if test "$PHP_CHASEN" = "yes"; then
- for i in /usr/local /usr; do
- if test -r "$i/include/chasen.h"; then
- CHASEN_INCDIR=$i/include
- CHASEN_LIBDIR=$i/lib
- fi
- done
- else
- if test -r "$PHP_CHASEN/include/chasen.h"; then
- CHASEN_INCDIR=$PHP_CHASEN/include
- CHASEN_LIBDIR=$PHP_CHASEN/lib
+ CHASEN_CONFIG=""
+ CHASEN_LDFLAGS=""
+ CHASEN_CFLAGS=""
+
+ if test "$PHP_CHASEN" = "yes"; then
+ pathes=
echo "$PATH" | tr ":" " "
+ for i in $pathes; do
+ if test -x "$i/chasen-config"; then
+ CHASEN_CONFIG="$i/chasen-config"
fi
+ done
+ else
+ if test -x "$PHP_CHASEN/bin/chasen-config"; then
+ CHASEN_CONFIG="$PHP_CHASEN/bin/chasen-config"
fi
+ fi
- if test -z "$CHASEN_INCDIR"; then
- AC_MSG_ERROR(Cannot find chasen.h. Please specify correct Chasen installation path)
+ if test -z "$CHASEN_CONFIG"; then
+ search_path="/usr/local /usr \"$HOME/local\" \"$HOME\""
+ if test -d "$PHP_CHASEN"; then
+ search_path="\"$PHP_CHASEN\""
fi
-
- CHASEN_INCLUDE="-I$CHASEN_INCDIR"
-
- AC_DEFINE(HAVE_CHASEN,1,[ ])
-
- PHP_ADD_LIBRARY_WITH_PATH(chasen, $CHASEN_LIBDIR, CHASEN_SHARED_LIBADD)
-
- PHP_NEW_EXTENSION(chasen, php_chasen.c, $ext_shared)
+ for i in $search_path; do
+ if test -r "$i/include/chasen.h"; then
+ CHASEN_CFLAGS="-I\"$i/include\""
+ CHASEN_LDFLAGS="-L\"$i/lib\""
+ fi
+ done
+ else
+ CHASEN_CFLAGS="$CHASEN_CONFIG" --cflags
+ CHASEN_LDFLAGS="$CHASEN_CONFIG" --libs
+ fi
+
+ if test -z "$CHASEN_LDFLAGS"; then
+ AC_MSG_ERROR(Cannot find libchasen. Please specify correct Chasen installation path)
+ fi
+
+ AC_DEFINE(HAVE_CHASEN,1,[ ])
+ PHP_EVAL_LIBLINE(["$CHASEN_LDFLAGS"], [CHASEN_SHARED_LIBADD])
+ PHP_EVAL_INCLINE(["$CHASEN_CFLAGS"])
+ PHP_NEW_EXTENSION(chasen, php_chasen.c, $ext_shared)
fi
-PHP_SUBST(CHASEN_INCLUDE)
PHP_SUBST(CHASEN_SHARED_LIBADD)