cvs: /php4/ext/interbase Makefile.in config.m4

sas Tue May 2 06:26:22 2000 EDT Modified files: /php4/ext/interbase Makefile.in config.m4 Log: Make interbase compilable as shared module Index: php4/ext/interbase/Makefile.in diff -u php4/ext/interbase/Makefile.in:1.6 php4/ext/interbase/Makefile.in:1.7 --- php4/ext/interbase/Makefile.in:1.6 Tue May 2 00:38:29 2000 +++ php4/ext/interbase/Makefile.in Tue May 2 06:26:22 2000 @@ -1,5 +1,7 @@ LTLIBRARY_NAME = libinterbase.la LTLIBRARY_SOURCES = interbase.c +LTLIBRARY_SHARED_NAME = interbase.la +LTLIBRARY_SHARED_LIBADD = $(INTERBASE_SHARED_LIBADD) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/interbase/config.m4 diff -u php4/ext/interbase/config.m4:1.3 php4/ext/interbase/config.m4:1.4 --- php4/ext/interbase/config.m4:1.3 Thu Dec 30 05:52:04 1999 +++ php4/ext/interbase/config.m4 Tue May 2 06:26:22 2000 @@ -1,29 +1,20 @@ -dnl $Id: config.m4,v 1.3 1999/12/30 04:52:04 sas Exp $ +dnl $Id: config.m4,v 1.4 2000/05/02 04:26:22 sas Exp $ -AC_MSG_CHECKING(for InterBase support) -AC_ARG_WITH(interbase, +PHP_ARG_WITH(interbase,for InterBase support, [ --with-interbase[=DIR] Include InterBase support. DIR is the InterBase base - install directory, defaults to /usr/interbase], -[ - if test "$withval" != "no"; then - if test "$withval" = "yes"; then - IBASE_INCDIR=/usr/interbase/include - IBASE_LIBDIR=/usr/interbase/lib - else - IBASE_INCDIR=$withval/include - IBASE_LIBDIR=$withval/lib - fi - IBASE_INCLUDE=-I$IBASE_INCDIR - IBASE_LFLAGS=-L$IBASE_LIBDIR - IBASE_LIBS="-lgds" - AC_DEFINE(HAVE_IBASE,1,[ ]) - AC_MSG_RESULT(yes) - EXTRA_LIBS="$EXTRA_LIBS $IBASE_LFLAGS $IBASE_LIBS" - INCLUDES="$INCLUDES $IBASE_INCLUDE" - PHP_EXTENSION(interbase) + install directory, defaults to /usr/interbase]) + +if test "$PHP_INTERBASE" != "no"; then + if test "$PHP_INTERBASE" = "yes"; then + IBASE_INCDIR=/usr/interbase/include + IBASE_LIBDIR=/usr/interbase/lib else - AC_MSG_RESULT(no) + IBASE_INCDIR=$PHP_INTERBASE/include + IBASE_LIBDIR=$PHP_INTERBASE/lib fi -],[ - AC_MSG_RESULT(no) -]) + AC_ADD_LIBRARY_WITH_PATH(gds, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD) + AC_ADD_INCLUDE($IBASE_INCDIR) + AC_DEFINE(HAVE_IBASE,1,[ ]) + PHP_EXTENSION(interbase, $ext_shared) + PHP_SUBST(INTERBASE_SHARED_LIBADD) +fi