[PHP-CVS] cvs: php4 /ext/pdf config.m4

2001-03-16 Thread Sascha Schumann 

sas Fri Mar 16 04:23:32 2001 EDT

  Modified files:  
/php4/ext/pdf   config.m4 
  Log:
  Don't do anything, if the user wants no PDF.
  
  
Index: php4/ext/pdf/config.m4
diff -u php4/ext/pdf/config.m4:1.15 php4/ext/pdf/config.m4:1.16
--- php4/ext/pdf/config.m4:1.15 Sun Mar 11 17:20:13 2001
+++ php4/ext/pdf/config.m4  Fri Mar 16 04:23:30 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.15 2001/03/12 01:20:13 sniper Exp $
+dnl $Id: config.m4,v 1.16 2001/03/16 12:23:30 sas Exp $
 
 PHP_ARG_WITH(pdflib,whether to include PDFlib support,
 [  --with-pdflib[=DIR] Include pdflib 3.x support. DIR is the pdflib
@@ -25,6 +25,8 @@
   AC_ADD_LIBRARY(png)
   AC_ADD_LIBRARY(jpeg)
   AC_ADD_LIBRARY(z)
+  ;;
+no)
   ;;
 *)
   test -f $withval/include/pdflib.h  PDFLIB_INCLUDE="$withval/include"



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

[PHP-CVS] cvs: php4 /ext/pdf config.m4

2001-03-11 Thread Jani Taskinen 

sniper  Sun Mar 11 17:20:14 2001 EDT

  Modified files:  
/php4/ext/pdf   config.m4 
  Log:
  ws fixes. Plus removed unnecessary AC_MSG_ calls.
  
Index: php4/ext/pdf/config.m4
diff -u php4/ext/pdf/config.m4:1.14 php4/ext/pdf/config.m4:1.15
--- php4/ext/pdf/config.m4:1.14 Mon Feb 12 09:50:38 2001
+++ php4/ext/pdf/config.m4  Sun Mar 11 17:20:13 2001
@@ -1,24 +1,22 @@
-dnl $Id: config.m4,v 1.14 2001/02/12 17:50:38 rjs Exp $
+dnl $Id: config.m4,v 1.15 2001/03/12 01:20:13 sniper Exp $
 
-AC_MSG_CHECKING(whether to include Pdflib 3.x support)
-
-PHP_ARG_WITH(pdflib,whether to include pdflib support,
+PHP_ARG_WITH(pdflib,whether to include PDFlib support,
 [  --with-pdflib[=DIR] Include pdflib 3.x support. DIR is the pdflib
- base install directory, defaults to /usr/local
- Set DIR to "shared" to build as dl, or "shared,DIR"
+  base install directory, defaults to /usr/local
+  Set DIR to "shared" to build as dl, or "shared,DIR"
   to build as dl and still specify DIR.])
 
   case "$PHP_PDFLIB" in
-no)
-  AC_MSG_RESULT(no) ;;
 yes)
-  AC_MSG_RESULT(yes)
   PHP_EXTENSION(pdf, $ext_shared)
   old_LDFLAGS=$LDFLAGS
- old_LIBS=$LIBS
- LIBS="$LIBS -ltiff -ljpeg -lpng -lz"
-  AC_CHECK_LIB(pdf, PDF_show_boxed, [AC_DEFINE(HAVE_PDFLIB,1,[ ])],
-[AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also 
need libtiff and libjpeg. If so, use the options --with-tiff-dir=DIR and 
--with-jpeg-dir=DIR)])
+  old_LIBS=$LIBS
+  LIBS="$LIBS -ltiff -ljpeg -lpng -lz"
+  AC_CHECK_LIB(pdf, PDF_show_boxed, [
+AC_DEFINE(HAVE_PDFLIB,1,[ ])
+  ],[
+AC_MSG_ERROR(pdflib extension requires at least pdflib 3.x. You may also need 
+libtiff and libjpeg. If so, use the options --with-tiff-dir=DIR and 
+--with-jpeg-dir=DIR)
+  ])
   LIBS=$old_LIBS
   LDFLAGS=$old_LDFLAGS
   PHP_SUBST(PDFLIB_SHARED_LIBADD)
@@ -31,7 +29,6 @@
 *)
   test -f $withval/include/pdflib.h  PDFLIB_INCLUDE="$withval/include"
   if test -n "$PDFLIB_INCLUDE" ; then
-AC_MSG_RESULT(yes)
 PHP_EXTENSION(pdf, $ext_shared)
 old_withval=$withval
 
@@ -112,13 +109,15 @@
 
 old_LIBS=$LIBS
 LIBS="$LIBS -L$withval/lib"
-AC_CHECK_LIB(pdf, PDF_show_boxed, [AC_DEFINE(HAVE_PDFLIB,1,[ ]) 
PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"],
-  [AC_MSG_ERROR(pdflib extension requires pdflib 3.x.)])
+AC_CHECK_LIB(pdf, PDF_show_boxed, [
+  AC_DEFINE(HAVE_PDFLIB,1,[ ]) 
+  PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"
+],[
+  AC_MSG_ERROR(pdflib extension requires pdflib 3.x.)
+])
 LIBS=$old_LIBS
-   PHP_SUBST(PDFLIB_SHARED_LIBADD)
+PHP_SUBST(PDFLIB_SHARED_LIBADD)
 AC_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD)
 AC_ADD_INCLUDE($PDFLIB_INCLUDE)
-  else
-AC_MSG_RESULT(no)
   fi ;;
   esac



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]