move the otk swig module into its own lib/directory
This commit is contained in:
parent
863c04cbd1
commit
1d4cff7d1e
2 changed files with 3 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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])
|
||||
])
|
||||
|
|
Loading…
Reference in a new issue