[php-directfb-cvs] PHP-DirectFB Makefile.am,1.1.1.1,1.2 configure.ac,1.1.1.1,1.2

[Claudio C. <kl...@us...>]

Update of /cvsroot/php-directfb/PHP-DirectFB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14887

Modified Files:
	Makefile.am configure.ac 
Log Message:
Added directfb-phpsource.


Index: configure.ac
===================================================================
RCS file: /cvsroot/php-directfb/PHP-DirectFB/configure.ac,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** configure.ac	10 Nov 2004 12:14:16 -0000	1.1.1.1
--- configure.ac	15 Nov 2004 15:13:16 -0000	1.2
***************
*** 55,58 ****
--- 55,59 ----
       AC_DEFINE( PHP_DEBUG, 1, [Define to 1 to enable PHP debugging support.] )
       AC_DEFINE( DFB_DEBUG, 1, [Define to 1 to enable DirectFB debugging support.] )
+      AC_DEFINE( PHP_DIRECTFB_DEBUG, 1, [Define to 1 to enable PHP-DirectFB debugging support.] )
       CFLAGS="$CFLAGS -g3 -fno-inline"
  else
***************
*** 71,75 ****
  AC_PATH_PROG( PHP_CONFIG, $PHP_CONFIG, no )
  if test "x$PHP_CONFIG" = "xno"; then
!      AC_MSG_ERROR( [* Cannot find php-config. Use --with-php-config=PATH] )
  fi
  
--- 72,76 ----
  AC_PATH_PROG( PHP_CONFIG, $PHP_CONFIG, no )
  if test "x$PHP_CONFIG" = "xno"; then
!      AC_MSG_ERROR( [*** Cannot find php-config. Use --with-php-config=PATH] )
  fi
  
***************
*** 94,98 ****
       *)
            AC_MSG_RESULT( [not found] )
!           AC_MSG_ERROR( [* PHP version 5.0.0 or newer is required. See http://php.net] )
            ;;
  esac
--- 95,100 ----
       *)
            AC_MSG_RESULT( [not found] )
!           AC_MSG_ERROR(
!                [*** PHP version 5.0.0 or newer is required. See http://php.net] )
            ;;
  esac
***************
*** 114,118 ****
  
  if ! pkg-config --atleast-pkgconfig-version 0.9 ; then
!      AC_MSG_ERROR( [* pkg-config too old; version 0.9 or newer is required. See http://pkgconfig.sf.net] )
  fi
  
--- 116,121 ----
  
  if ! pkg-config --atleast-pkgconfig-version 0.9 ; then
!      AC_MSG_ERROR(
!           [*** pkg-config too old; version 0.9 or newer is required. See http://pkgconfig.sf.net] )
  fi
  
***************
*** 130,134 ****
  else
       AC_MSG_RESULT( [not found] )
!      AC_MSG_ERROR( [* DirectFB version $DIRECTFB_REQUIRED_VERSION or newer is required. See http://directfb.org] )
  fi
  
--- 133,138 ----
  else
       AC_MSG_RESULT( [not found] )
!      AC_MSG_ERROR(
!           [*** DirectFB version $DIRECTFB_REQUIRED_VERSION or newer is required. See http://directfb.org] )
  fi
  
***************
*** 137,140 ****
--- 141,170 ----
  
  
+ #
+ # Check Tools
+ #
+ AC_ARG_WITH( tools, 
+      [  --without-tools         do not build any tools],
+      BUILD_TOOLS=$withvalm, BUILD_TOOLS=yes )
+ if test "x$BUILD_TOOLS" = "xyes"; then
+ # Check libpng (required by directfb-phpsource)
+      AC_CHECK_LIB( z, gzsetparams, ZLIB="-lz", )
+      AC_CHECK_HEADER( png.h, have_png_h=yes, have_png_h=no )
+      if test "x$have_png_h" = "xyes"; then
+           AC_CHECK_LIB( png, png_read_info, have_png=yes, have_png=no, $ZLIB -lm )
+           if test "x$have_png" = "xno"; then
+                AC_MSG_WARN(
+                [*** PNG Library not found. directfb-phpsource will not be built.])
+           fi
+      else
+           AC_MSG_WARN(
+                [*** PNG header not found. directfb-phpsource will not be built.])
+      fi
+ fi
+ 
+ AM_CONDITIONAL( BUILD_DIRECTFB_PHPSOURCE, test "x$have_png" = "xyes" )
+ AC_SUBST( ZLIB )
+ 
+ 
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
***************
*** 143,146 ****
--- 173,177 ----
  Makefile
  src/Makefile
+ tools/Makefile
  ])
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/php-directfb/PHP-DirectFB/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	10 Nov 2004 12:14:16 -0000	1.1.1.1
--- Makefile.am	15 Nov 2004 15:13:16 -0000	1.2
***************
*** 1 ****
! SUBDIRS = src
--- 1 ----
! SUBDIRS = src tools