Sorry, forgot to send the patch. (I realize I forgot to send my
revised patch to Jean-Claude last time too, so here it is :-)
--
=Nicholas Riley <[EMAIL PROTECTED]> | <http://www.uiuc.edu/ph/www/njriley>
Pablo Research Group, Department of Computer Science and
Medical Scholars Program, University of Illinois at Urbana-Champaign
--- metakit-2.4.8/unix/Makefile.in Sat Nov 2 16:29:13 2002
+++ metakit-2.4.8+njr1/unix/Makefile.in Thu Nov 28 16:33:56 2002
@@ -34,12 +34,15 @@
srcdir = @srcdir@
top_builddir = .
-pyincludedir = @includedir@/python2.2
-pylibdir = @libdir@/python2.2/site-packages
+pyincludedir = @PY_INCLUDE_DIR@
+pylibdir = @PY_LIB_DIR@
tclsh = tclsh
tclincludedir = @TCL_INCLUDE_DIR@
-tcllibdir = @TCL_INCLUDE_DIR@/../lib
+tcllibdir = @TCL_LIB_DIR@
+
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
# Compiling without frame pointers can play tricks with exception handling
# (e.g. in Mk4py). This does not affect standard operation, *only* errors.
@@ -55,7 +58,8 @@
INSTALL_DATA = $L --mode=install @INSTALL_DATA@
INSTALL_PROGRAM = $L --mode=install @INSTALL_PROGRAM@
-LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
+LIBTOOL_SHLIB_FLAGS = $(LDFLAGS) @LIBTOOL_SHLIB_FLAGS@
+LIBTOOL_MODULE_FLAGS = $(LDFLAGS) @LIBTOOL_MODULE_FLAGS@
STRIP_FLAGS = @STRIP_FLAGS@
@@ -63,20 +67,20 @@
#---------- Do not change, shorthand only
-CXX_SWITCHES = $(CXXFLAGS) \
+CXX_SWITCHES = $(CPPFLAGS) $(CXXFLAGS) \
-I$(srcdir)/../include \
-I$(srcdir)/../src -I.
-CXX_SWITCHES_TCL = $(CXXFLAGS) \
+CXX_SWITCHES_TCL = $(CPPFLAGS) $(CXXFLAGS) \
-I$(srcdir)/../include \
-I$(tclincludedir)/generic \
-I$(tclincludedir)
-CXX_SWITCHES_PY = $(CXXFLAGS) \
+CXX_SWITCHES_PY = $(CPPFLAGS) $(CXXFLAGS) \
-I$(srcdir)/../include \
-I$(srcdir)/../python/scxx \
-I$(pyincludedir)
-CXX_SWITCHES_LUA = $(CXXFLAGS) \
+CXX_SWITCHES_LUA = $(CPPFLAGS) $(CXXFLAGS) \
-I$(srcdir)/../include
-CXX_SWITCHES_TEST = $(CXXFLAGS) \
+CXX_SWITCHES_TEST = $(CPPFLAGS) $(CXXFLAGS) \
-I$(srcdir)/../include
#---------- The targets normally specified when calling "make"
@@ -87,7 +91,7 @@
tcl: Makefile Mk4tcl@SHLIB_SUFFIX@
-python: Makefile Mk4py@SHLIB_SUFFIX@
+python: Makefile Mk4py@MODULE_SUFFIX@
test: Makefile libmk4.la regress
test -d tests || mkdir tests
@@ -114,9 +118,9 @@
$(INSTALL_PROGRAM) Mk4tcl@SHLIB_SUFFIX@ $(DESTDIR)$(tcllibdir)/Mk4tcl
echo 'package ifneeded Mk4tcl 2.4.8 [list load [file join $$dir
Mk4tcl@SHLIB_SUFFIX@] Mk4tcl]' >$(DESTDIR)$(tcllibdir)/Mk4tcl/pkgIndex.tcl
-install-python: Mk4py@SHLIB_SUFFIX@
- $(INSTALL_PROGRAM) Mk4py@SHLIB_SUFFIX@ $(DESTDIR)$(pylibdir)
- $(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $$(DESTDIR)(pylibdir)
+install-python: Mk4py@MODULE_SUFFIX@
+ $(INSTALL_PROGRAM) Mk4py@MODULE_SUFFIX@ $(DESTDIR)$(pylibdir)
+ $(INSTALL_PROGRAM) $(srcdir)/../python/metakit.py $(DESTDIR)$(pylibdir)
clean:
$L rm -f *.la *.o *.lo
@@ -138,7 +142,7 @@
cd $(srcdir) && autoconf
libmk4.la: $(LIBOBJS) $(LINK_SPECIAL_FILES)
- $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_FLAGS) -avoid-version \
+ $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_SHLIB_FLAGS)
+-avoid-version \
-rpath $(libdir) $(SHLOBJS) $(LINK_SPECIAL_FLAGS)
Mk4tcl@SHLIB_SUFFIX@: libmk4tcl.la
@@ -146,15 +150,15 @@
-strip $(STRIP_FLAGS) $@ 2>/dev/null
libmk4tcl.la: mk4tcl.o mk4too.o $(LIBOBJS) $(LINK_SPECIAL_FILES)
- $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_FLAGS) -avoid-version \
+ $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_SHLIB_FLAGS)
+-avoid-version \
-rpath $(libdir) mk4tcl.lo mk4too.lo $(SHLOBJS) $(LINK_SPECIAL_FLAGS)
-Mk4py@SHLIB_SUFFIX@: libmk4py.la
- cp .libs/libmk4py@SHLIB_SUFFIX@ $@
+Mk4py@MODULE_SUFFIX@: libmk4py.la
+ cp .libs/libmk4py@MODULE_SUFFIX@ $@
-strip $(STRIP_FLAGS) $@ 2>/dev/null
libmk4py.la: $(PYOBJS) $(LIBOBJS)
- $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_FLAGS) -avoid-version \
+ $L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_MODULE_FLAGS)
+-avoid-version \
-rpath $(libdir) $(SPYOBJS) $(SHLOBJS)
Mk4lua@SHLIB_SUFFIX@: mk4lua.o libmk4.la
--- metakit-2.4.8/unix/configure.in Fri Oct 4 15:54:02 2002
+++ metakit-2.4.8+njr1/unix/configure.in Thu Nov 28 16:27:13 2002
@@ -8,25 +8,71 @@
MK_TARGETS="core"
MK_INSTALL="install-mk"
-AC_ARG_ENABLE(python, [ --enable-python build the Mk4py extension for
Python], [python_ok=$enableval], [python_ok=no])
+AC_ARG_WITH(python,
+[ --with-python=PATH build the Mk4py extension for Python with headers in
+ `PATH/include/python2.2'; install the Mk4py modules in
+ `PATH/lib/python2.2/site-packages'. If PATH is of the
+ form `HEADER:LIB', search for header files in HEADER,
+ and install Mk4py in LIB. If you omit the `=PATH'
+ part completely, the configure script will use the
+ provided includedir and libdir.],
+ [with_python=${withval}], [with_python=no])
AC_MSG_CHECKING([for Python configuration])
-if test "$python_ok" = yes; then
+case "$with_python" in
+ "yes" )
+ PY_INCLUDE_DIR='${includedir}/python2.2'
+ PY_LIB_DIR='${libdir}/python2.2/site-packages'
+ ;;
+ "no" )
+ PY_INCLUDE_DIR=""
+ ;;
+ *":"* )
+ PY_INCLUDE_DIR="`echo $with_python | sed -e 's/:.*$//'`"
+ PY_LIB_DIR="`echo $with_python | sed -e 's/^.*://'`"
+ ;;
+ * )
+ PY_INCLUDE_DIR="$with_python/include/python2.2"
+ PY_LIB_DIR="$with_python/lib/python2.2/site-packages"
+ ;;
+esac
+
+if test x"${PY_INCLUDE_DIR}" != x; then
MK_TARGETS="$MK_TARGETS python"
MK_INSTALL="$MK_INSTALL install-python"
- AC_MSG_RESULT(enabled)
+ AC_MSG_RESULT($PY_INCLUDE_DIR and $PY_LIB_DIR)
else
AC_MSG_RESULT(not enabled)
fi
-AC_ARG_WITH(tcl, [ --with-tcl=DIR location of tcl.h header file],
[TCL_INCLUDE_DIR=${withval}])
+AC_ARG_WITH(tcl,
+[ --with-tcl=PATH build the Mk4tcl extension for Tcl with tcl.h in
+ `PATH/include/tcl.h'; install the Mk4tcl package
+ in `PATH/lib'. If PATH is of the form `HEADER:LIB',
+ search for tcl.h in HEADER, and install Mk4tcl in
+ LIB.], [with_tcl=${withval}], [with_tcl=no])
AC_MSG_CHECKING([for Tcl headers])
+case "$with_tcl" in
+ "no" )
+ TCL_INCLUDE_DIR=""
+ ;;
+ *":"* )
+ TCL_INCLUDE_DIR="`echo $with_tcl | sed -e 's/:.*$//'`"
+ TCL_LIB_DIR="`echo $with_tcl | sed -e 's/^.*://'`"
+ ;;
+ * )
+ TCL_INCLUDE_DIR="$with_tcl/include"
+ TCL_LIB_DIR="$with_tcl/lib"
+ ;;
+esac
if test x"${TCL_INCLUDE_DIR}" != x ; then
if test -f "${TCL_INCLUDE_DIR}/tcl.h" ; then
AC_MSG_RESULT(found ${TCL_INCLUDE_DIR}/tcl.h)
MK_TARGETS="$MK_TARGETS tcl"
MK_INSTALL="$MK_INSTALL install-tcl"
+ AC_MSG_CHECKING(for Tcl package installation location)
+ AC_MSG_RESULT(${TCL_LIB_DIR})
else
AC_MSG_ERROR([${TCL_INCLUDE_DIR} directory doesn't contain tcl.h])
fi
@@ -59,24 +105,29 @@
# Deal with shared lib differences
SHLIB_SUFFIX=".so"
+MODULE_SUFFIX=".so"
STRIP_FLAGS=
-LIBTOOL_FLAGS=-module
+LIBTOOL_SHLIB_FLAGS=
+LIBTOOL_MODULE_FLAGS=-module
case $build_os in
darwin*)
SHLIB_SUFFIX=".dylib"
+ # MODULE_SUFFIX remains .so (Darwin doesn't care)
STRIP_FLAGS=-S
- LIBTOOL_FLAGS=
;;
hpux*)
SHLIB_SUFFIX=".sl"
+ MODULE_SUFFIX=".sl"
if test "X$build_cpu" = "Xia64" ; then
- # libtools insists on .so files for HPUX/Itanium :(
+ # libtool insists on .so files for HP-UX/Itanium :(
SHLIB_SUFFIX=".so"
+ MODULE_SUFFIX=".so"
fi
;;
cyg*)
SHLIB_SUFFIX=".dll"
+ MODULE_SUFFIX=".dll"
;;
esac
@@ -126,10 +177,17 @@
AC_SUBST(MK_TARGETS)
AC_SUBST(MK_INSTALL)
+AC_SUBST(PY_INCLUDE_DIR)
+AC_SUBST(PY_LIB_DIR)
AC_SUBST(TCL_INCLUDE_DIR)
+AC_SUBST(TCL_LIB_DIR)
AC_SUBST(EXEEXT)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(LIBTOOL_FLAGS)
+AC_SUBST(MODULE_SUFFIX)
+AC_SUBST(LIBTOOL_SHLIB_FLAGS)
+AC_SUBST(LIBTOOL_MODULE_FLAGS)
AC_SUBST(STRIP_FLAGS)
AC_OUTPUT(Makefile)
