* configuration file config.m4 rewritten

git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3090 92316355-f0b4-4df1-b90c-862c8a59935f

pipi-php/config.m4

@@ -2,12 +2,11 @@ PHP_ARG_ENABLE(pipi, whether to enable Libpipi support,
 [ --enable-pipi   Enable Libpipi support])
 
 if test "$PHP_PIPI" = "yes"; then
-  PHP_NEW_EXTENSION(pipi, php_pipi.c, $ext_shared)
-  PHP_SUBST(PIPI_SHARED_LIBADD)
-  AC_DEFINE(HAVE_PIPI, 1, [Whether you have Libpipi Ext])
-  PIPI_INCDIR=$PHP_PIPI/include
-  PIPI_LIBDIR=$PHP_PIPI/lib
-  PHP_ADD_LIBRARY_WITH_PATH(pipi, $PIPI_LIBDIR, PIPI_SHARED_LIBADD)
-  PHP_ADD_INCLUDE($PIPI_INCDIR)  
-fi
-
+	AC_CHECK_LIB(pipi, pipi_get_version, [
+		PHP_ADD_LIBRARY(pipi,, PIPI_SHARED_LIBADD)
+	], [
+		AC_MSG_ERROR(libpipi required !)
+	])
+	PHP_NEW_EXTENSION(pipi, php_pipi.c, $ext_shared,,)
+	PHP_SUBST(PIPI_SHARED_LIBADD)
+fi 

pipi-php/examples/example1.php

@@ -1,7 +1,4 @@
 <?
-//print_r(pipi_get_command_list());
-echo PIPI_COLOR_Y;
-
 $img = pipi_load_stock("random:128x128");
 $img = pipi_gaussian_blur($img, 10);
 //$img = pipi_box_blur($img, 30);

pipi-php/package.xml

@@ -14,24 +14,20 @@
   </maintainer>
   </maintainers>
  <release>
-  <version>0.1</version>
+  <version>0.0</version>
   <date>2008-10-15</date>
-  <license>GPL</license>
+  <license>WTFPL</license>
   <state>alpha</state>
-  <notes>See  included ChangeLog for details...
+  <notes>See included ChangeLog for details...
   </notes>
   <deps>
-   <dep type="php" rel="ge" version="4.0.0"/>
+   <dep type="php" rel="ge" version="5.0.0"/>
   </deps>
   <filelist>
    <file role="data" name="examples/example1.php"/>
    <file role="src" name="config.m4"/>
-   <file role="data" name="COPYING"/>
-   <file role="data" name="EXPERIMENTAL"/>
    <file role="src" name="php_pipi.c"/>
    <file role="src" name="php_pipi.h"/>
-   <file role="data" name="README"/>
-   <file role="data" name="ChangeLog"/>
   </filelist>
  </release>
 </package>

pipi-php/php_pipi.c

@@ -124,7 +124,7 @@ PHP_MINFO_FUNCTION(pipi) {
 }
 
 
-//--------PIPI'S RESSOURCES---------//
+//--------PIPI'S RESSOURCES DESTRUCTORS---------//
 
 static void php_pipi_image_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
 	pipi_free(rsrc->ptr);
@@ -138,6 +138,9 @@ static void php_pipi_histogram_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) {
 	pipi_free_histogram(rsrc->ptr);
 }
 
+
+//--------INITIALIZATION---------//
+
 PHP_MINIT_FUNCTION(pipi) {
 	le_pipi_image = zend_register_list_destructors_ex(php_pipi_image_dtor, NULL, PHP_PIPI_IMAGE_RES_NAME, module_number);
 	le_pipi_context = zend_register_list_destructors_ex(php_pipi_context_dtor, NULL, PHP_PIPI_CONTEXT_RES_NAME, module_number);