[PHP4BETA] CVS update: php4/ext/imap

Date: Thursday April 22, 1999 @ 0:21 Author: rasmus Update of /repository/php4/ext/imap In directory php:/tmp/cvs-serv24401/ext/imap Modified Files: Makefile.in config.m4 Log Message: Bring imap build rules up to date. We still have a problem here though. In this new build structure we are adding libraries to $LIBS as we add modules instead of doing an AC_SUBST into the Makefile. One reason for doing the subst in php3 was to get around the libraries that could not be included in $LIBS because doing so would mess up the various configure tests. For example, you can't do a -limap as part of the various simple configure compile programs because -limap requires a bunch of callback symbols to be present. Index: php4/ext/imap/Makefile.in diff -c php4/ext/imap/Makefile.in:1.2 php4/ext/imap/Makefile.in:1.3 *** php4/ext/imap/Makefile.in:1.2 Wed Apr 21 22:48:23 1999 --- php4/ext/imap/Makefile.in Thu Apr 22 00:21:04 1999 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.3 from Makefile.am ! # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** *** 10,19 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! # $Id: Makefile.in,v 1.2 1999/04/22 02:48:23 ssb Exp $ ! SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ --- 10,19 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! # $Id: Makefile.in,v 1.3 1999/04/22 04:21:04 rasmus Exp $ ! SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ *************** *** 34,40 **** includedir = @includedir@ oldincludedir = /usr/include ! DISTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ --- 34,40 ---- includedir = @includedir@ oldincludedir = /usr/include ! DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ *************** *** 48,54 **** AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ --- 48,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ *************** *** 95,103 **** WARNING_LEVEL = @WARNING_LEVEL@ YACC = @YACC@ ! INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend ! noinst_LIBRARIES=libphpext_imap.a ! libphpext_imap_a_SOURCES=imap.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = --- 95,103 ---- WARNING_LEVEL = @WARNING_LEVEL@ YACC = @YACC@ ! INCLUDES = @INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend ! noinst_LIBRARIES = libphpext_imap.a ! libphpext_imap_a_SOURCES = imap.c mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h CONFIG_CLEAN_FILES = *************** *** 111,133 **** libphpext_imap_a_LIBADD = libphpext_imap_a_OBJECTS = imap.o AR = ar ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) ! LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = tar ! GZIP = --best SOURCES = $(libphpext_imap_a_SOURCES) OBJECTS = $(libphpext_imap_a_OBJECTS) ! all: Makefile $(LIBRARIES) ! .SUFFIXES: .SUFFIXES: .S .c .o .s ! $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps ext/imap/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status --- 111,133 ---- libphpext_imap_a_LIBADD = libphpext_imap_a_OBJECTS = imap.o AR = ar ! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ! CCLD = $(CC) ! LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ! TAR = gtar ! GZIP_ENV = --best SOURCES = $(libphpext_imap_a_SOURCES) OBJECTS = $(libphpext_imap_a_OBJECTS) ! all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s ! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps ext/imap/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status *************** *** 171,178 **** tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) here=pwd && cd $(srcdir) \ ! && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ --- 171,182 ---- tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=pwd && cd $(srcdir) \ ! && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ *************** *** 200,268 **** distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ ! test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file; \ done ! info: ! dvi: ! check: all ! $(MAKE) ! installcheck: ! install-exec: ! @$(NORMAL_INSTALL) ! ! install-data: ! @$(NORMAL_INSTALL) ! ! install: install-exec install-data all ! @: ! ! uninstall: ! install-strip: ! $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: ! -rm -f Makefile $(DISTCLEANFILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: ! -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) ! -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) ! mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-tags mostlyclean-generic ! clean: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ ! mostlyclean ! distclean: distclean-noinstLIBRARIES distclean-compile distclean-tags \ ! distclean-generic clean ! -rm -f config.status ! maintainer-clean: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir info dvi installcheck \ ! install-exec install-data install uninstall all installdirs \ ! mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 204,285 ---- distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ ! if test -d $$d/$$file; then \ ! cp -pr $$/$$file $(distdir)/$$file; \ ! else \ ! test -f $(distdir)/$$file \ ! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ! || cp -p $$d/$$file $(distdir)/$$file || :; \ ! fi; \ done ! info-am: ! info: info-am ! dvi-am: ! dvi: dvi-am ! check-am: all-am ! check: check-am ! installcheck-am: ! installcheck: installcheck-am ! install-exec-am: ! install-exec: install-exec-am ! ! install-data-am: ! install-data: install-data-am ! ! install-am: all-am ! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! install: install-am ! uninstall-am: ! uninstall: uninstall-am ! all-am: Makefile $(LIBRARIES) ! all-redirect: all-am install-strip: ! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-tags mostlyclean-generic + + mostlyclean: mostlyclean-am ! clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ ! mostlyclean-am ! clean: clean-am ! distclean-am: distclean-noinstLIBRARIES distclean-compile \ ! distclean-tags distclean-generic clean-am ! ! distclean: distclean-am ! ! maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." + maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ ! clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ ! check-am installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: php4/ext/imap/config.m4 diff -c php4/ext/imap/config.m4:1.1 php4/ext/imap/config.m4:1.2 *** php4/ext/imap/config.m4:1.1 Wed Apr 21 20:45:13 1999 --- php4/ext/imap/config.m4 Thu Apr 22 00:21:04 1999 *************** *** 1,43 **** ! dnl $Id: config.m4,v 1.1 1999/04/22 00:45:13 ssb Exp $ AC_MSG_CHECKING(for IMAP support) AC_ARG_WITH(imap, [ --with-imap[=DIR] Include IMAP support (DIR is the IMAP include dir and c-client.a dir).], [ - if test "$withval" != "no"; then if test "$withval" = "yes"; then ! IMAP_DIR=/usr/local ! else ! IMAP_DIR=$withval ! fi ! if test ! -f $IMAP_DIR/include/mail.h; then ! AC_MSG_ERROR(could not find mail.h in $IMAP_DIR/include !) ! fi ! if test ! -f $IMAP_DIR/include/rfc822.h; then ! AC_MSG_ERROR(could not find rfc822.h in $IMAP_DIR/include !) ! fi ! if test ! -f $IMAP_DIR/include/linkage.h; then ! AC_MSG_ERROR(could not find linkage.h in $IMAP_DIR/include !) fi ! if test ! -f $IMAP_DIR/lib/c-client.a; then ! AC_MSG_ERROR(could not find c-client.a in $IMAP_DIR/lib !) fi - IMAP_INCLUDE="-I$IMAP_DIR/include/" - IMAP_LIBS="$IMAP_DIR/lib/c-client.a" - - dnl## AC_SUBST(IMAP_INCLUDE) - INCLUDES="$INCLUDES $IMAP_INCLUDE" - AC_SUBST(IMAP_LIBS) - LIBS="$LIBS $IMAP_LIBS" - AC_DEFINE(HAVE_IMAP) - AC_MSG_RESULT(yes) - PHP_EXTENSION(imap) - else - AC_MSG_ERROR(could not find imap library!) - fi ],[ AC_MSG_RESULT(no) ]) - --- 1,70 ---- ! dnl $Id: config.m4,v 1.2 1999/04/22 04:21:04 rasmus Exp $ AC_MSG_CHECKING(for IMAP support) AC_ARG_WITH(imap, [ --with-imap[=DIR] Include IMAP support (DIR is the IMAP include dir and c-client.a dir).], [ if test "$withval" = "yes"; then ! if test -f /usr/local/include/mail.h; then ! withval=/usr/local ! elif test -f /usr/include/mail.h; then ! withval=/usr ! elif test -f /usr/include/imap/mail.h; then ! withval=/usr ! fi fi ! if test "$withval" != "no"; then ! IMAP_DIR=$withval ! if test -f $IMAP_DIR/include/imap/mail.h; then ! IMAP_INC_DIR=$IMAP_DIR/include/imap ! else ! IMAP_INC_DIR=$withval/include ! fi ! if test ! -f $IMAP_INC_DIR/mail.h; then ! AC_MSG_ERROR(could not find mail.h in $IMAP_INC_DIR !) ! fi ! if test ! -f $IMAP_INC_DIR/rfc822.h; then ! AC_MSG_ERROR(could not find rfc822.h in $IMAP_INC_DIR !) ! fi ! if test ! -f $IMAP_INC_DIR/linkage.h; then ! AC_MSG_ERROR(could not find linkage.h in $IMAP_INC_DIR !) ! fi ! if test -n "$APXS"; then ! if test -f $IMAP_DIR/lib/libimap.a; then ! IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -limap" ! elif test ! -f $IMAP_DIR/lib/libc-client.a; then ! if test ! -f $IMAP_DIR/lib/libc-client4.so; then ! AC_MSG_ERROR(You need to copy or link $IMAP_DIR/lib/c-client.a to $IMAP_DIR/lib/libc-client.a) ! else ! IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4" ! fi ! else ! IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client" ! fi ! else ! if test -f $IMAP_DIR/lib/libimap.a; then ! IMAP_LIBS="-L$IMAP_DIR/lib -limap" ! elif test ! -f $IMAP_DIR/lib/c-client.a; then ! if test ! -f $IMAP_DIR/lib/libc-client4.so; then ! AC_MSG_ERROR(could not find c-client.a in $IMAP_DIR/lib !) ! else ! IMAP_LIBS="${ld_runpath_switch}$IMAP_DIR/lib -L$IMAP_DIR/lib -lc-client4" ! fi ! else ! IMAP_LIBS="-L$IMAP_DIR/lib $IMAP_DIR/lib/c-client.a" ! fi ! fi ! IMAP_INCLUDE="-I$IMAP_INC_DIR/" ! AC_SUBST(IMAP_LIBS) ! LIBS="$LIBS $IMAP_LIBS" ! AC_DEFINE(HAVE_IMAP) ! AC_MSG_RESULT(yes) ! PHP_EXTENSION(imap) ! else ! AC_MSG_ERROR(could not find imap library!) fi ],[ AC_MSG_RESULT(no) ]) -- PHP 4 Beta