 |
 |
 |
 |
|
|
Date: 02/26/99
- Next message: philip <email protected>: "[PHP-DEV] Bug #1187: ODBC odbc_lastserror() function"
- Previous message: rasmus: "[PHP-DEV] CVS update: php3/functions"
- Next in thread: zeev: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Date: Friday February 26, 1999 @ 0:56
Author: rasmus
Update of /repository/php3
In directory asf:/u/temp/cvs-serv25110
Modified Files:
INSTALL.REDHAT Makefile.in acconfig.h config.h.in configure.in
libphp3.module.in
Log Message:
Configure stuff for the ImageMagick module. Only tested on RH Linux
so far.
Index: php3/INSTALL.REDHAT
diff -c php3/INSTALL.REDHAT:1.10 php3/INSTALL.REDHAT:1.11
*** php3/INSTALL.REDHAT:1.10 Thu Feb 25 19:11:22 1999
--- php3/INSTALL.REDHAT Fri Feb 26 00:56:36 1999
***************
*** 109,114 ****
--- 109,118 ----
automatically detect them and add TTF stuff. Note that you also need
GD support for TTF support to be activated.
+ ImageMagick -with-imagick
+ You need the bzip2 RPM along with the ImageMagick-devel-4.2.0-1 RPM
+ or later.
+
IMAP --with-imap
Get the latest imap-devel RPM from a RedHatContrib mirror site and
install it.
Index: php3/Makefile.in
diff -c php3/Makefile.in:1.294 php3/Makefile.in:1.295
*** php3/Makefile.in:1.294 Thu Feb 25 07:17:00 1999
--- php3/Makefile.in Fri Feb 26 00:56:36 1999
***************
*** 24,30 ****
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.294 1999/02/25 12:17:00 thies Exp $
#
prefix = <email protected>@
--- 24,30 ----
# +----------------------------------------------------------------------+
#
! # $Id: Makefile.in,v 1.295 1999/02/26 05:56:36 rasmus Exp $
#
prefix = <email protected>@
***************
*** 37,43 ****
AR = ar rc
BINNAME = <email protected>@
INSTALL_IT = <email protected>@
! INCLUDE = -I$(srcdir) -I. <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
PROF_CFLAGS =
CFLAGS_SHLIB = <email protected>@
LDFLAGS_SHLIB = <email protected>@
--- 37,43 ----
AR = ar rc
BINNAME = <email protected>@
INSTALL_IT = <email protected>@
! INCLUDE = -I$(srcdir) -I. <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
PROF_CFLAGS =
CFLAGS_SHLIB = <email protected>@
LDFLAGS_SHLIB = <email protected>@
***************
*** 98,104 ****
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
! LIBS = <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
all: $(BINNAME)
--- 98,104 ----
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
! LIBS = <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@
all: $(BINNAME)
Index: php3/acconfig.h
diff -c php3/acconfig.h:1.83 php3/acconfig.h:1.84
*** php3/acconfig.h:1.83 Thu Feb 25 10:53:20 1999
--- php3/acconfig.h Fri Feb 26 00:56:36 1999
***************
*** 28,33 ****
--- 28,37 ----
/* Netscape LDAP SDK check */
#undef HAVE_NSLDAP
+ /* 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 */
#define HAVE_DIRENT_H 0
Index: php3/config.h.in
diff -c php3/config.h.in:1.142 php3/config.h.in:1.143
*** php3/config.h.in:1.142 Thu Feb 25 10:53:20 1999
--- php3/config.h.in Fri Feb 26 00:56:36 1999
***************
*** 95,100 ****
--- 95,104 ----
/* Netscape LDAP SDK check */
#undef HAVE_NSLDAP
+ /* ImageMagick check */
+ #undef HAVE_LIBMAGICK
+ #undef HAVE_LIBBZ2
+
/* Define if you have struct flock */
#define HAVE_STRUCT_FLOCK 0
Index: php3/configure.in
diff -c php3/configure.in:1.327 php3/configure.in:1.328
*** php3/configure.in:1.327 Thu Feb 25 11:13:58 1999
--- php3/configure.in Fri Feb 26 00:56:36 1999
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.327 1999/02/25 16:13:58 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.328 1999/02/26 05:56:36 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 229,235 ****
withval=apxs
fi
APXS="$withval"
! APXS_LDFLAGS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@"
APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
BINNAME=libphp3.so
--- 229,235 ----
withval=apxs
fi
APXS="$withval"
! APXS_LDFLAGS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@"
APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
BINNAME=libphp3.so
***************
*** 709,714 ****
--- 709,753 ----
AC_SUBST(GETTEXT_LIBS)
AC_SUBST(GETTEXT_LFLAGS)
AC_SUBST(GETTEXT_INCLUDE)
+
+ AC_MSG_CHECKING(whether to include ImageMagick support)
+ AC_ARG_WITH(imagick,
+ [ --with-imagick[=DIR] Include ImageMagick support. DIR is the
+ intall directory, and if left out, PHP will
+ try to find it on its own. [experimental]],
+ [
+ if test "$withval" != "no"; then
+ if test "$withval" = "yes"; then
+ IMAGICK_INCDIR=/usr/X11R6/include/X11/magick
+ IMAGICK_LIBDIR=/usr/X11R6/lib/
+ test -f /usr/local/include/magick/magick.h && IMAGICK_INCDIR=/usr/local/include/magick
+ test -f /usr/local/lib/libMagick.a && IMAGICK_LIBDIR=/usr/local/lib
+ else
+ IMAGICK_INCDIR=$withval
+ IMAGICK_LIBDIR=$withval
+ test -f $withval/include/magick.h && IMAGICK_INCDIR=$withval/include
+ test -f $withval/lib/libMagick.a && IMAGICK_LIBDIR=$withval/lib
+ test -f $withval/include/magick/magick.h && IMAGICK_INCDIR=$withval/include/magick
+ 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
+ AC_MSG_RESULT(no)
+ fi
+ ],[
+ AC_MSG_RESULT(no)
+ ])
+ AC_SUBST(IMAGICK_LIBS)
+ AC_SUBST(IMAGICK_LFLAGS)
+ AC_SUBST(IMAGICK_INCLUDE)
AC_MSG_CHECKING(for Oracle support)
AC_ARG_WITH(oracle,
Index: php3/libphp3.module.in
diff -c php3/libphp3.module.in:1.19 php3/libphp3.module.in:1.20
*** php3/libphp3.module.in:1.19 Tue Feb 9 01:53:56 1999
--- php3/libphp3.module.in Fri Feb 26 00:56:36 1999
***************
*** 1,7 ****
Name: php3_module
ConfigStart
RULE_WANTHSREGEX= <email protected>@
! LIBS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ $LIBS <email protected>@"
RULE_HIDE=yes
ConfigEnd
--- 1,7 ----
Name: php3_module
ConfigStart
RULE_WANTHSREGEX= <email protected>@
! LIBS=" <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ <email protected>@ $LIBS <email protected>@"
RULE_HIDE=yes
ConfigEnd
-- 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>
- Next message: philip <email protected>: "[PHP-DEV] Bug #1187: ODBC odbc_lastserror() function"
- Previous message: rasmus: "[PHP-DEV] CVS update: php3/functions"
- Next in thread: zeev: "[PHP-DEV] CVS update: php3"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]