Hola,

I think it's wise to notify the maintainer, so that this fix can be
included in the pdflib distribution too...

Derick

On Tue, 13 Nov 2001, Jani Taskinen wrote:

> sniper                Tue Nov 13 08:59:12 2001 EDT
>
>   Modified files:
>     /php4/ext/pdf     config.m4 Makefile.in
>   Log:
>   Fixed some problems in configuring e.g. shared module.
>
> Index: php4/ext/pdf/config.m4
> diff -u php4/ext/pdf/config.m4:1.24 php4/ext/pdf/config.m4:1.25
> --- php4/ext/pdf/config.m4:1.24       Tue Oct  9 08:24:43 2001
> +++ php4/ext/pdf/config.m4    Tue Nov 13 08:59:12 2001
> @@ -1,5 +1,5 @@
>  dnl
> -dnl $Id: config.m4,v 1.24 2001/10/09 12:24:43 rjs Exp $
> +dnl $Id: config.m4,v 1.25 2001/11/13 13:59:12 sniper Exp $
>  dnl
>
>  PHP_ARG_WITH(pdflib3,whether to include PDFlib3 support,
> @@ -15,7 +15,7 @@
>
>    case $PHP_PDFLIB3 in
>      yes)
> -      AC_CHECK_LIB(pdf, PDF_show_boxed, [
> +      PHP_CHECK_LIBRARY(pdf, PDF_show_boxed, [
>          AC_DEFINE(HAVE_PDFLIB3,1,[ ])
>        ],[
>          AC_MSG_ERROR([pdflib3 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>])
> @@ -127,36 +127,37 @@
>                            to build as dl and still specify DIR.])
>
>  if test "$PHP_PDFLIB" != "no"; then
> +
> +  PHP_EXTENSION(pdf, $ext_shared)
> +  PHP_SUBST(PDFLIB_SHARED_LIBADD)
> +
>    case "$PHP_PDFLIB" in
>      yes)
> -      PHP_EXTENSION(pdf, $ext_shared)
>        AC_CHECK_LIB(pdf, PDF_open_pdi, [
>          AC_DEFINE(HAVE_PDFLIB,1,[ ])
> +        PHP_ADD_LIBRARY(pdf,, PDFLIB_SHARED_LIBADD)
>        ],[
> -        AC_MSG_ERROR([PDFlib extension requires at least PDFlib 4.x. To build wit
> -h PDFlib 3.x you should use --with-pdflib3.])
> +        AC_MSG_ERROR([PDFlib extension requires at least PDFlib 4.x. To build with 
>PDFlib 3.x you should use --with-pdflib3.])
>        ])
> -      AC_SUBST(PDFLIB_SHARED_LIBADD)
> -      PHP_ADD_LIBRARY(pdf, PDFLIB_SHARED_LIBADD)
>        ;;
>      no)
>        ;;
>      *)
> -      test -f $withval/include/pdflib.h && PDFLIB_INCLUDE="$withval/include"
> +      test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE="$PHP_PDFLIB/include"
>        if test -n "$PDFLIB_INCLUDE" ; then
> -        PHP_EXTENSION(pdf, $ext_shared)
> -        old_LIBS=$LIBS
> -        LIBS="$LIBS -L$withval/lib"
> -        AC_CHECK_LIB(pdf, PDF_open_pdi, [
> +        PHP_CHECK_LIBRARY(pdf, PDF_open_pdi, [
>            AC_DEFINE(HAVE_PDFLIB,1,[ ])
> -          PDFLIB_LIBS="$PDFLIB_LIBS -L$withval/lib -lpdf"
> +          PHP_ADD_LIBRARY_WITH_PATH(pdf, $PHP_PDFLIB/lib, PDFLIB_SHARED_LIBADD)
> +          PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
>          ],[
>            AC_MSG_ERROR([PDFlib extension requires PDFlib 4.x.])
> +        ],[
> +          -L$PHP_PDFLIB/lib
>          ])
> -        LIBS=$old_LIBS
> -        AC_SUBST(PDFLIB_SHARED_LIBADD)
> -        PHP_ADD_LIBRARY_WITH_PATH(pdf, $withval/lib, PDFLIB_SHARED_LIBADD)
> -        PHP_ADD_INCLUDE($PDFLIB_INCLUDE)
> -      fi ;;
> +      else
> +          AC_MSG_ERROR([pdflib.h not found under $PHP_PDFLIB/include/])
> +      fi
> +      ;;
>    esac
> +
>  fi
> Index: php4/ext/pdf/Makefile.in
> diff -u php4/ext/pdf/Makefile.in:1.7 php4/ext/pdf/Makefile.in:1.8
> --- php4/ext/pdf/Makefile.in:1.7      Mon Feb 12 12:50:37 2001
> +++ php4/ext/pdf/Makefile.in  Tue Nov 13 08:59:12 2001
> @@ -2,7 +2,6 @@
>  LTLIBRARY_NAME    = libpdf.la
>  LTLIBRARY_SOURCES = pdf.c
>  LTLIBRARY_SHARED_NAME    = libpdf_php.la
> -PDFLIB_SHARED_LIBBADD    = -lpdf
>  LTLIBRARY_SHARED_LIBADD  = $(PDFLIB_SHARED_LIBBADD)
>
>  include $(top_srcdir)/build/dynlib.mk
>
>
>
> --
> 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]
>

Derick Rethans

---------------------------------------------------------------------
        PHP: Scripting the Web - www.php.net - [EMAIL PROTECTED]
             SRM: Site Resource Manager - www.vl-srm.net
---------------------------------------------------------------------


-- 
PHP Development 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]

Reply via email to