diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-11 04:44:41 +0000 |
| commit | a374efce3a207b39514be3c52264091400ce297e (patch) | |
| tree | 77bdf654b55826d4f59b53a5621310206bcaead1 /kig/configure.in.in | |
| parent | f81a494f3957d5cf38c787973415597941934727 (diff) | |
| download | tdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip | |
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/configure.in.in')
| -rw-r--r-- | kig/configure.in.in | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/kig/configure.in.in b/kig/configure.in.in index 33986af8..b9884199 100644 --- a/kig/configure.in.in +++ b/kig/configure.in.in @@ -121,6 +121,12 @@ AC_DEFUN([REGINA_LIB_BOOST_PYTHON], [ "$prefix/include/$pyver" "$prefix/$pyver/include"; do CXXFLAGS="$__regina_py_save_cxxflags -I$incdir" LDFLAGS="$__regina_py_save_ldflags -shared" + if test -z "$qt_libraries"; then + LDFLAGS="$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$qt_libraries" + fi + LDFLAGS="$LDFLAGS -ltqt" # Check for python includes. AC_TRY_COMPILE([ @@ -146,6 +152,12 @@ AC_DEFUN([REGINA_LIB_BOOST_PYTHON], [ for extralibs in "" "-lpthread -lm -lutil -ldl"; do AC_MSG_CHECKING([for $pylibdir/lib$pylib and $extralibs with $incdir/Python.h]) LDFLAGS="$__regina_py_save_ldflags -L$pylibdir" + if test -z "$qt_libraries"; then + LDFLAGS="$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$qt_libraries" + fi + LDFLAGS="$LDFLAGS -ltqt" LIBS="-l$pylib $extralibs" AC_TRY_LINK([ #include <Python.h> @@ -156,6 +168,12 @@ AC_DEFUN([REGINA_LIB_BOOST_PYTHON], [ for bplib in "-lboost_python-mt" "-lboost_python-gcc-mt-1_32" "-lboost_python-gcc-mt-1_31" "-lboost_python-gcc-mt" "-lboost_python"; do AC_MSG_CHECKING([compilation of a boost.python program with $bplib]) LDFLAGS="$__regina_py_save_ldflags -L$pylibdir" + if test -z "$qt_libraries"; then + LDFLAGS="$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$qt_libraries" + fi + LDFLAGS="$LDFLAGS -ltqt" LIBS="-l$pylib $bplib $extralibs" AC_TRY_LINK([ #include <boost/python.hpp> |