|
|
@ -311,7 +311,7 @@ EOT
|
|
|
|
|
|
|
|
|
|
|
|
dnl ------------------------------------------------------------------------
|
|
|
|
dnl ------------------------------------------------------------------------
|
|
|
|
dnl Find the meta object compiler and the ui compiler in the PATH,
|
|
|
|
dnl Find the meta object compiler and the ui compiler in the PATH,
|
|
|
|
dnl in $QTDIR/bin, and some more usual places
|
|
|
|
dnl in $TQTDIR/bin, and some more usual places
|
|
|
|
dnl ------------------------------------------------------------------------
|
|
|
|
dnl ------------------------------------------------------------------------
|
|
|
|
dnl
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([AC_PATH_TQT_MOC_UIC],
|
|
|
|
AC_DEFUN([AC_PATH_TQT_MOC_UIC],
|
|
|
@ -1357,10 +1357,10 @@ else
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if test $kde_qtver = 4; then
|
|
|
|
if test $kde_qtver = 4; then
|
|
|
|
kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
|
|
|
|
kde_qt_dirs="$TQTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $kde_qtver = 3; then
|
|
|
|
if test $kde_qtver = 3; then
|
|
|
|
kde_qt_dirs="$QTDIR /usr/lib/tqt3 /usr/lib/qt3 /usr/lib/qt /usr/share/tqt3 /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
|
|
|
|
kde_qt_dirs="$TQTDIR /usr/lib/tqt3 /usr/lib/qt3 /usr/lib/qt /usr/share/tqt3 /usr/share/qt3 /usr/lib${tdelibsuff}/qt-3.3"
|
|
|
|
if test -z "$PKG_CONFIG"; then
|
|
|
|
if test -z "$PKG_CONFIG"; then
|
|
|
|
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
|
|
|
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
@ -1379,10 +1379,10 @@ if test $kde_qtver = 3; then
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $kde_qtver = 2; then
|
|
|
|
if test $kde_qtver = 2; then
|
|
|
|
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
|
|
|
|
kde_qt_dirs="$TQTDIR /usr/lib/qt2 /usr/lib/qt"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $kde_qtver = 1; then
|
|
|
|
if test $kde_qtver = 1; then
|
|
|
|
kde_qt_dirs="$QTDIR /usr/lib/qt"
|
|
|
|
kde_qt_dirs="$TQTDIR /usr/lib/qt"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
@ -6033,10 +6033,10 @@ if test "${with_qt_dir+set}" = set; then
|
|
|
|
kde_qtdir="$with_qt_dir"
|
|
|
|
kde_qtdir="$with_qt_dir"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/tqt3/doc /usr/lib/qt3/doc /usr/lib/tqt3/doc/html /usr/lib/qt3/doc/html /usr/doc/tqt3/html /usr/doc/qt3/html /usr/doc/tqt3 /usr/doc/qt3 /usr/share/doc/tqt3-doc /usr/share/doc/qt3-doc /usr/share/tqt3/doc/html /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
|
|
|
|
AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $TQTDIR/doc/html /usr/share/doc/packages/tqt3/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/tqt3/doc /usr/lib/qt3/doc /usr/lib/tqt3/doc/html /usr/lib/qt3/doc/html /usr/doc/tqt3/html /usr/doc/qt3/html /usr/doc/tqt3 /usr/doc/qt3 /usr/share/doc/tqt3-doc /usr/share/doc/qt3-doc /usr/share/tqt3/doc/html /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], TQTDOCDIR)
|
|
|
|
AC_MSG_RESULT($QTDOCDIR)
|
|
|
|
AC_MSG_RESULT($TQTDOCDIR)
|
|
|
|
|
|
|
|
|
|
|
|
AC_SUBST(QTDOCDIR)
|
|
|
|
AC_SUBST(TQTDOCDIR)
|
|
|
|
|
|
|
|
|
|
|
|
KDE_FIND_PATH(dot, DOT, [], [])
|
|
|
|
KDE_FIND_PATH(dot, DOT, [], [])
|
|
|
|
if test -n "$DOT"; then
|
|
|
|
if test -n "$DOT"; then
|
|
|
@ -6054,7 +6054,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
|
|
|
|
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
|
|
|
|
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
|
|
|
|
|
|
|
|
|
|
|
|
KDE_HAS_DOXYGEN=no
|
|
|
|
KDE_HAS_DOXYGEN=no
|
|
|
|
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
|
|
|
|
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $TQTDOCDIR/qsql.html; then
|
|
|
|
KDE_HAS_DOXYGEN=yes
|
|
|
|
KDE_HAS_DOXYGEN=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_SUBST(KDE_HAS_DOXYGEN)
|
|
|
|
AC_SUBST(KDE_HAS_DOXYGEN)
|
|
|
@ -6808,9 +6808,9 @@ AC_DEFUN([AC_SQLITE3], [
|
|
|
|
if test ! "lib${tdelibsuff}" = "lib"; then
|
|
|
|
if test ! "lib${tdelibsuff}" = "lib"; then
|
|
|
|
tqtlib=".lib64"
|
|
|
|
tqtlib=".lib64"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test x$QTDIR = x; then
|
|
|
|
if test x$TQTDIR = x; then
|
|
|
|
QTDIR=`dirname $MOC`
|
|
|
|
TQTDIR=`dirname $MOC`
|
|
|
|
QTDIR=${QTDIR%/bin}
|
|
|
|
TQTDIR=${TQTDIR%/bin}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$PKG_CONFIG" != "no" ; then
|
|
|
|
if test "$PKG_CONFIG" != "no" ; then
|
|
|
|
if $PKG_CONFIG --exists qt-mt ; then
|
|
|
|
if $PKG_CONFIG --exists qt-mt ; then
|
|
|
@ -6822,7 +6822,7 @@ AC_DEFUN([AC_SQLITE3], [
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "x$qt_plugins_dir" = "x"; then
|
|
|
|
if test "x$qt_plugins_dir" = "x"; then
|
|
|
|
qt_plugins_dir=${QTDIR}/plugins
|
|
|
|
qt_plugins_dir=${TQTDIR}/plugins
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so
|
|
|
|
LIBSQLITE3=${qt_plugins_dir}/sqldrivers/libqsqlite3${tqtlib}.so
|
|
|
|
|
|
|
|
|
|
|
@ -6860,12 +6860,12 @@ AC_DEFUN([AC_SQLITE3], [
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
if test $enable_sqlite3 = yes; then
|
|
|
|
if test $enable_sqlite3 = yes; then
|
|
|
|
AC_MSG_CHECKING(if the environment variable QTDIR is set)
|
|
|
|
AC_MSG_CHECKING(if the environment variable TQTDIR is set)
|
|
|
|
if test x$QTDIR = x; then
|
|
|
|
if test x$TQTDIR = x; then
|
|
|
|
AC_MSG_ERROR(QTDIR not set)
|
|
|
|
AC_MSG_ERROR(TQTDIR not set)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($QTDIR)
|
|
|
|
AC_MSG_RESULT($TQTDIR)
|
|
|
|
ac_qmake=${QTDIR}/bin/qmake
|
|
|
|
ac_qmake=${TQTDIR}/bin/qmake
|
|
|
|
AC_ARG_WITH(qmake,
|
|
|
|
AC_ARG_WITH(qmake,
|
|
|
|
AC_HELP_STRING([--with-qmake=PATH],[which version of QMake to use ]),
|
|
|
|
AC_HELP_STRING([--with-qmake=PATH],[which version of QMake to use ]),
|
|
|
|
[ ac_qmake="$withval" ])
|
|
|
|
[ ac_qmake="$withval" ])
|
|
|
|