svn: /pecl/shp/trunk/ config.m4 php_shp.h

andrey Mon, 21 Sep 2009 08:26:44 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=288508 Log: Fix building, now works on Ubuntu, probably on many other platforms Changed paths: U pecl/shp/trunk/config.m4 U pecl/shp/trunk/php_shp.h Modified: pecl/shp/trunk/config.m4 =================================================================== --- pecl/shp/trunk/config.m4 2009-09-21 08:14:49 UTC (rev 288507) +++ pecl/shp/trunk/config.m4 2009-09-21 08:26:44 UTC (rev 288508) @@ -4,16 +4,18 @@ if test "$PHP_SHP" != "no"; then # --with-shp -> check with-path SEARCH_PATH="/usr/local /usr" # you might want to change this - SEARCH_FOR="/include/libshp/shapefil.h" # you most likely want to change this + SEARCH_FOR="/include/shapefil.h /include/libshp/shapefil.h" # you most likely want to change this if test -r $PHP_SHP/$SEARCH_FOR; then # path given as parameter SHP_DIR=$PHP_SHP else # search default path list AC_MSG_CHECKING([for shp files in default path]) for i in $SEARCH_PATH ; do - if test -r $i/$SEARCH_FOR; then - SHP_DIR=$i - AC_MSG_RESULT(found in $i) - fi + for j in $SEARCH_FOR ; do + if test -r $i/$j; then + SHP_DIR=$i + AC_MSG_RESULT(found in $i) + fi + done done fi @@ -26,8 +28,8 @@ PHP_ADD_INCLUDE($SHP_DIR/include) # --with-shp -> check for lib and symbol presence - LIBNAME=shp # you may want to change this - LIBSYMBOL=SHPOpen # you most likely want to change this + LIBNAME=shp + LIBSYMBOL=SHPOpen PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, [ Modified: pecl/shp/trunk/php_shp.h =================================================================== --- pecl/shp/trunk/php_shp.h 2009-09-21 08:14:49 UTC (rev 288507) +++ pecl/shp/trunk/php_shp.h 2009-09-21 08:26:44 UTC (rev 288508) @@ -21,7 +21,7 @@ #ifndef PHP_SHP_H #define PHP_SHP_H -#include "libshp/shapefil.h" +#include "shapefil.h" extern zend_module_entry shp_module_entry; #define phpext_shp_ptr &shp_module_entry