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

eriksson Thu Aug 9 17:53:50 2001 EDT Modified files: /php4/ext/satellite config.m4 Makefile.in Log: rewrote configuration script Index: php4/ext/satellite/config.m4 diff -u php4/ext/satellite/config.m4:1.3 php4/ext/satellite/config.m4:1.4 --- php4/ext/satellite/config.m4:1.3 Tue Feb 20 10:12:30 2001 +++ php4/ext/satellite/config.m4 Thu Aug 9 17:53:49 2001 @@ -1,40 +1,76 @@ -dnl $Id: config.m4,v 1.3 2001/02/20 15:12:30 eriksson Exp $ +dnl $Id: config.m4,v 1.4 2001/08/09 21:53:49 eriksson Exp $ +dnl vim: syntax=config -dnl My first config.m4 - be nice to me... :-) +dnl My first config.m4 - now much improved... :-) -PHP_ARG_ENABLE(satellite, whether to enable CORBA support via Satellite, +PHP_ARG_WITH(satellite, whether to enable CORBA support via Satellite, dnl Make sure that the comment is aligned: -[ --enable-satellite Enable CORBA support via Satellite (Requires ORBit)]) +[ --with-satellite[=DIR] Enable CORBA support via Satellite (EXPERIMENTIAL) + DIR is the base directory for ORBit]) if test "$PHP_SATELLITE" != "no"; then - - dnl check for orbit-config - AC_PATH_PROG(orbit_config, "orbit-config") + + dnl So, we have an extension called satellite + PHP_EXTENSION(satellite, $ext_shared) + + dnl We want to use these variables in Makefile.in + PHP_SUBST(SATELLITE_SHARED_LIBADD) + + dnl Now, where is ORBit? + AC_MSG_CHECKING(for ORBit) + + dnl These directories look reasonable + for i in $PHP_SATELLITE /usr/local/orbit /usr/local /usr; do + + dnl Does this look like an ORBit installation? + if test -e $i/include/orb/orbit.h; then + + dnl Save directory and report result + ORBIT_PATH=$i + AC_MSG_RESULT(found in $i) + + fi + done + + dnl Abort if the loop above failed + if test -z "$ORBIT_PATH"; then + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please (re)install ORBit) + fi + + dnl + dnl SATELLITE_CONFIG(config-name, path, [extra], message) + dnl + AC_DEFUN(SATELLITE_CONFIG,[ + + dnl look for config program + AC_PATH_PROG(satellite_$1, $1-config, , $2) + if test -z "$satellite_$1"; then + AC_MSG_ERROR($4) + fi + + dnl get cflags + satellite_cflags=$satellite_$1 --cflags $3 + if test -z "$satellite_cflags"; then + AC_MSG_ERROR($4) + fi + PHP_EVAL_INCLINE($satellite_cflags) + + dnl get libs + satellite_libs=$satellite_$1 --libs $3 + if test -z "$satellite_libs"; then + AC_MSG_ERROR($4) + fi + PHP_EVAL_LIBLINE($satellite_libs) + ]) + + SATELLITE_CONFIG(orbit, $ORBIT_PATH/bin, [client], [Please (re)install ORBit]) + SATELLITE_CONFIG(libIDL, $ORBIT_PATH/bin, , [Please (re)install libIDL]) - if test -z "$orbit_config"; then - AC_MSG_ERROR(Cannot find orbit-config, install ORBit!) - fi - dnl check for symbol giop_skip_atexit in libIIOP AC_CHECK_LIB(IIOP, giop_skip_atexit, [true], [ AC_MSG_ERROR([You need a CVS version of ORBit, please read ext/satellite/README]) - ], $orbit_config --libs client) - - dnl ORBIT_CFLAGS=$orbit_config --cflags client - dnl ORBIT_LIBS=$orbit_config --libs client - - dnl check for libIDL-config - AC_PATH_PROG(libidl_config, "libIDL-config") - - if test -z "libidl_config"; then - AC_MSG_ERROR(Cannot find libIDL-config, install libIDL!) - fi - - dnl LIBIDL_CFLAGS=$libidl_config --cflags - dnl LIBIDL_LIBS=$libidl_config --libs - - dnl CFLAGS="$CFLAGS $ORBIT_CFLAGS $LIBIDL_CFLAGS" + ], "$ORBIT_LIBS" ) - AC_DEFINE(HAVE_SATELLITE, 1, [CORBA support enabled via Satellite]) - PHP_EXTENSION(satellite, $ext_shared) + AC_DEFINE(HAVE_SATELLITE,1,[ ]) fi Index: php4/ext/satellite/Makefile.in diff -u php4/ext/satellite/Makefile.in:1.3 php4/ext/satellite/Makefile.in:1.4 --- php4/ext/satellite/Makefile.in:1.3 Mon Feb 26 01:07:15 2001 +++ php4/ext/satellite/Makefile.in Thu Aug 9 17:53:49 2001 @@ -17,7 +17,7 @@ # # -# $Id: Makefile.in,v 1.3 2001/02/26 06:07:15 andi Exp $ +# $Id: Makefile.in,v 1.4 2001/08/09 21:53:49 eriksson Exp $ # vim: tabstop=2 shiftwidth=2 # @@ -44,11 +44,10 @@ typecode.c \ typemanager.c \ zval_to_namedvalue.c -LTLIBRARY_SHARED_NAME = satellite.la -#LTLIBRARY_SHARED_LIBADD = orbit-config --libs client libIDL-config --libs -LTLIBRARY_LDFLAGS=orbit-config --libs client libIDL-config --libs +LTLIBRARY_SHARED_NAME = satellite.la +LTLIBRARY_SHARED_LIBADD = $(SATELLITE_SHARED_LIBADD) -EXTRA_CFLAGS = -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations orbit-config --cflags client libIDL-config --cflags +EXTRA_CFLAGS = -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations include $(top_srcdir)/build/dynlib.mk