[PHP-DEV] CVS update: php3 From: rasmus (php-dev <email protected>)
Date: 02/27/99

Date: Saturday February 27, 1999 @ 13:47
Author: rasmus

Update of /repository/php3
In directory asf:/home/rasmus/php3

Modified Files:
        acconfig.h config.h.in configure.in
Log Message:
ImageMagick build fixes for Solaris

Index: php3/acconfig.h
diff -c php3/acconfig.h:1.84 php3/acconfig.h:1.85
*** php3/acconfig.h:1.84 Fri Feb 26 00:56:36 1999
--- php3/acconfig.h Sat Feb 27 13:47:12 1999
***************
*** 30,36 ****
  
  /* ImageMagick check */
  #undef HAVE_LIBMAGICK
- #undef HAVE_LIBBZ2
  
  /* Define if you have dirent.h but opendir() resides in libc rather than in libdir */
  /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */
--- 30,35 ----
Index: php3/config.h.in
diff -c php3/config.h.in:1.143 php3/config.h.in:1.144
*** php3/config.h.in:1.143 Fri Feb 26 00:56:36 1999
--- php3/config.h.in Sat Feb 27 13:47:13 1999
***************
*** 97,103 ****
  
  /* ImageMagick check */
  #undef HAVE_LIBMAGICK
- #undef HAVE_LIBBZ2
  
  /* Define if you have struct flock */
  #define HAVE_STRUCT_FLOCK 0
--- 97,102 ----
Index: php3/configure.in
diff -c php3/configure.in:1.329 php3/configure.in:1.330
*** php3/configure.in:1.329 Sat Feb 27 10:46:13 1999
--- php3/configure.in Sat Feb 27 13:47:13 1999
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.329 1999/02/27 15:46:13 sas Exp $
  dnl Process this file with autoconf to produce a configure script.
  
  AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.330 1999/02/27 18:47:13 rasmus Exp $
  dnl Process this file with autoconf to produce a configure script.
  
  AC_INIT(main.c)
***************
*** 731,742 ****
                     test -f $withval/lib/magick/libMagick.a && IMAGICK_LIBDIR=$withval/lib/magick
             fi
          AC_MSG_RESULT(yes)
! AC_CHECK_LIB(bz2, bzBuffToBuffCompress, [AC_DEFINE(HAVE_LIBBZ2)],
! [AC_MSG_ERROR(ImageMagick module requires libbz2)])
! IMAGICK_INCLUDE=-I$IMAGICK_INCDIR
! IMAGICK_LFLAGS=-L$IMAGICK_LIBDIR
! IMAGICK_LIBS="-lMagick -lbz2"
!
          AC_DEFINE(HAVE_LIBMAGICK)
  
    else
--- 731,760 ----
                     test -f $withval/lib/magick/libMagick.a && IMAGICK_LIBDIR=$withval/lib/magick
             fi
          AC_MSG_RESULT(yes)
! AC_PATH_X
! IMAGICK_LIBS="-lMagick -lX11"
! IMAGICK_INCLUDE="-I$IMAGICK_INCDIR -I${ac_x_includes}/X11"
! IMAGICK_LFLAGS="-L$IMAGICK_LIBDIR -L${ac_x_libraries}"
! O_CPPFLAGS="$CPPFLAGS"
! O_LDFLAGS=$LDFLAGS
! CPPFLAGS="$CPPFLAGS -I${ac_x_includes}/X11"
! LDFLAGS="$LDFLAGS -L${ac_x_libraries}"
! dnl check for a whole whack of possible required libraries
! AC_CHECK_LIB(bz2, bzBuffToBuffCompress, IMAGICK_LIBS="$IMAGICK_LIBS -lbz2",,)
! AC_CHECK_LIB(Xext,XShapeCombineMask, IMAGICK_LIBS="$IMAGICK_LIBS -lXext",,)
! AC_CHECK_LIB(dps,DPSInitialize, IMAGICK_LIBS="$IMAGICK_LIBS -ldps",,)
! AC_CHECK_LIB(dpstk,XDPSPixelsPerPoint, IMAGICK_LIBS="$IMAGICK_LIBS -ldpstk",,)
! AC_CHECK_LIB(tiff,TIFFOpen, IMAGICK_LIBS="$IMAGICK_LIBS -ltiff",,)
! AC_CHECK_LIB(jpeg,jpeg_read_header, IMAGICK_LIBS="$IMAGICK_LIBS -ljpeg",,)
! AC_CHECK_LIB(z,compress, IMAGICK_LIBS="$IMAGICK_LIBS -lz",,)
! AC_CHECK_LIB(fpx,FPX_OpenImageByFilename, IMAGICK_LIBS="$IMAGICK_LIBS -lfpx",,)
! AC_CHECK_LIB(png,png_info_init, IMAGICK_LIBS="$IMAGICK_LIBS -lpng",,)
! AC_CHECK_LIB(ttf,TT_Init_FreeType, IMAGICK_LIBS="$IMAGICK_LIBS -lttf",,)
! AC_CHECK_LIB(df,DFANputlabel, IMAGICK_LIBS="$IMAGICK_LIBS -ldf",,)
! AC_CHECK_LIB(jbig,jbg_dec_init, IMAGICK_LIBS="$IMAGICK_LIBS -ljbig",,)
!
! CPPFLAGS=$O_CPPFLAGS
! LDFLAGS=$O_LDFLAGS
          AC_DEFINE(HAVE_LIBMAGICK)
  
    else 

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>