diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-02-05 10:40:43 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-02-05 10:40:43 +0000 |
| commit | 1d4cff7d1e59a9851ce380b51a4bf2393e698fc5 (patch) | |
| tree | 2d1d185ffb7e345ee489544246e7380b1107df02 | |
| parent | 863c04cbd18a4018d76123ed5020c56565f44a83 (diff) | |
move the otk swig module into its own lib/directory
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/python.m4 | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ea3172e2..9d58ce20 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,7 @@ OB_DEBUG OB_COMPILER_FLAGS AC_C_BIGENDIAN +AC_PROG_LN_S AC_PROG_LIBTOOL LIBTOOL="$LIBTOOL --silent" AC_PROG_INSTALL @@ -47,6 +48,7 @@ X11_EXT_XINERAMA AC_CONFIG_FILES([Makefile po/Makefile.in otk/Makefile + otk/wrap/Makefile src/Makefile scripts/Makefile doc/Makefile diff --git a/m4/python.m4 b/m4/python.m4 index cd5117d0..49602977 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -2,7 +2,7 @@ # # Checks for Python and tries to get the include path to 'Python.h', and # the libpython library. -# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(PYTHON_LDFLAGS) output +# It provides the $(PYTHON_CFLAGS) $(PYTHON_LIBS) output # variables. AC_DEFUN([PYTHON_DEVEL], [ @@ -42,20 +42,17 @@ AC_DEFUN([PYTHON_DEVEL], if test -r "$i/libpython$PYTHON_VERSION.so"; then PYLIB="$i/libpython$PYTHON_VERSION.so" PYTHON_LIBS="-L$i -lpython$PYTHON_VERSION" - PYTHON_LDFLAGS="" break else if test -r "$i/libpython$PYTHON_VERSION.a"; then PYLIB="$i/libpython$PYTHON_VERSION.a" PYTHON_LIBS="-L$i -lpython$PYTHON_VERSION -lpthread -ldl -lutil -lm" - PYTHON_LDFLAGS="-export-dynamic" break else # look for really old versions if test -r "$i/libPython.a"; then PYLIB="$i/libPython.a" PYTHON_LIBS="-L$i -lModules -lPython -lObjects -lParser" - PYTHON_LDFLAGS="-export-dynamic" break fi fi @@ -68,5 +65,4 @@ AC_DEFUN([PYTHON_DEVEL], AC_MSG_ERROR([cannot find python library]) fi AC_SUBST([PYTHON_LIBS]) - AC_SUBST([PYTHON_LDFLAGS]) ]) |