Jug, please try this one.
Changes :
o handle moc/moc2
o cache Qt build results
regards
john
--
"To be fair i do look quite like a monkey ..."
- Peter Reid
? config/qt2.bak.m4
Index: autogen.sh
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.35
diff -u -r1.35 autogen.sh
--- autogen.sh 10 Sep 2002 15:00:40 -0000 1.35
+++ autogen.sh 12 Sep 2002 14:58:59 -0000
@@ -33,7 +33,7 @@
AUTOCONF="autoconf"
GNUM4=
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4
isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4
pspell.m4 pkg.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4
+isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4
+pspell.m4 pkg.m4"
SIGCPP_ACINCLUDE_FILES="libtool.m4"
echo -n "Locating GNU m4... "
Index: config/configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.ac,v
retrieving revision 1.5
diff -u -r1.5 configure.ac
--- config/configure.ac 10 Sep 2002 15:00:40 -0000 1.5
+++ config/configure.ac 12 Sep 2002 14:59:04 -0000
@@ -189,13 +189,13 @@
FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms
${GNOME_FRONTEND_CFLAGS} "
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
;;
- qt2)
- QT2_DO_IT_ALL
+ qt)
+ QT_DO_IT_ALL
FRONTEND="qt2"
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
- FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
- FRONTEND_LIBS="\$(QT2_LIBS)";;
+ FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+ FRONTEND_LIBS="\$(QT_LIB)";;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
Index: config/configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/configure.in,v
retrieving revision 1.4
diff -u -r1.4 configure.in
--- config/configure.in 14 Aug 2002 21:22:27 -0000 1.4
+++ config/configure.in 12 Sep 2002 14:59:06 -0000
@@ -190,13 +190,13 @@
FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms
${GNOME_FRONTEND_CFLAGS} "
FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
- qt2)
- QT2_DO_IT_ALL
+ qt)
+ QT_DO_IT_ALL
FRONTEND="qt2"
FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
- FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
- FRONTEND_LIBS="\$(QT2_LIBS)";;
+ FRONTEND_LDFLAGS="\$(QT_LDFLAGS)"
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT_INCLUDES)"
+ FRONTEND_LIBS="\$(QT_LIB)";;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.76
diff -u -r1.76 lyxinclude.m4
--- config/lyxinclude.m4 16 Aug 2002 14:56:33 -0000 1.76
+++ config/lyxinclude.m4 12 Sep 2002 14:59:14 -0000
@@ -699,7 +699,7 @@
[AC_MSG_CHECKING([what frontend should be used as main GUI])
AC_ARG_WITH(frontend,
[ --with-frontend=THIS Use THIS frontend as main GUI:
- Possible values: xforms, qt2, gnome],
+ Possible values: xforms, qt, gnome],
[lyx_use_frontend="$withval"], [lyx_use_frontend="xforms"])
AC_MSG_RESULT($lyx_use_frontend)
AC_SUBST(FRONTEND)
Index: config/qt.m4
===================================================================
RCS file: config/qt.m4
diff -N config/qt.m4
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/qt.m4 12 Sep 2002 14:59:14 -0000
@@ -0,0 +1,187 @@
+
+dnl Please leave this alone. I use this file in
+dnl oprofile.
+FATAL=0
+
+dnl find a binary in the path
+AC_DEFUN(QT_FIND_PATH,
+[
+ AC_MSG_CHECKING([for $1])
+ AC_CACHE_VAL(qt_cv_path_$1,
+ [
+ qt_cv_path_$1="NONE"
+ if test -n "$$2"; then
+ qt_cv_path_$1="$$2";
+ else
+ dirs="$3"
+ qt_save_IFS=$IFS
+ IFS=':'
+ for dir in $PATH; do
+ dirs="$dirs $dir"
+ done
+ IFS=$qt_save_IFS
+
+ for dir in $dirs; do
+ if test -x "$dir/$1"; then
+ if test -n "$5"; then
+ evalstr="$dir/$1 $5 2>&1 "
+ if eval $evalstr; then
+ qt_cv_path_$1="$dir/$1"
+ break
+ fi
+ else
+ qt_cv_path_$1="$dir/$1"
+ break
+ fi
+ fi
+ done
+ fi
+ ])
+
+ if test -z "$qt_cv_path_$1" || test "$qt_cv_path_$1" = "NONE"; then
+ AC_MSG_RESULT(not found)
+ $4
+ else
+ AC_MSG_RESULT($qt_cv_path_$1)
+ $2=$qt_cv_path_$1
+ fi
+])
+
+dnl Find the uic compiler on the path or in qt_cv_dir
+AC_DEFUN(QT_FIND_UIC,
+[
+ QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin)
+ if test -z "$ac_uic" -a "$FATAL" = 1; then
+ AC_MSG_ERROR([uic binary not found in \$PATH or $qt_cv_dir/bin !])
+ fi
+])
+
+dnl Find the right moc in path/qt_cv_dir
+AC_DEFUN(QT_FIND_MOC,
+[
+ QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin)
+ QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin)
+
+ if test -n "$ac_moc1" -a -n "$ac_moc2"; then
+ dnl found both. Prefer Qt3's if it exists else moc2
+ $ac_moc1 -v 2>&1 | grep "Qt 3" >/dev/null
+ if test "$?" = 0; then
+ ac_moc=$ac_moc1;
+ else
+ ac_moc=$ac_moc2;
+ fi
+ else
+ if test -n "$ac_moc1"; then
+ ac_moc=$ac_moc1;
+ else
+ ac_moc=$ac_moc2;
+ fi
+ fi
+
+ if test -z "$ac_moc" -a "$FATAL" = 1; then
+ AC_MSG_ERROR([moc binary not found in \$PATH or $qt_cv_dir/bin !])
+ fi
+])
+
+dnl check a particular libname
+AC_DEFUN(QT_TRY_LINK,
+[
+ CXXFLAGS="$BASE_CXXFLAGS $1"
+ AC_TRY_LINK([
+ #include <qglobal.h>
+ #include <qstring.h>
+ ],
+ [
+ QString s("mangle_failure");
+ #if (QT_VERSION < 221)
+ break_me_(\\\);
+ #endif
+ ],
+ qt_cv_libname=$1,
+ )
+ CXXFLAGS="$BASE_CXXFLAGS"
+])
+
+dnl check we can do a compile
+AC_DEFUN(QT_CHECK_COMPILE,
+[
+ AC_MSG_CHECKING([for Qt library name])
+
+ AC_CACHE_VAL(qt_cv_libname,
+ [
+ AC_LANG_CPLUSPLUS
+ SAVE_CXXFLAGS=$CXXFLAGS
+ BASE_CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
+
+ for libname in -lqt3 -lqt2 -lqt -lqt-mt;
+ do
+ QT_TRY_LINK($libname)
+ if test -n "$qt_cv_libname"; then
+ break;
+ fi
+ done
+
+ CXXFLAGS=$SAVE_CXXFLAGS
+ ])
+
+ if test -z "$qt_cv_libname"; then
+ AC_MSG_RESULT([failed])
+ if test "$FATAL" = 1 ; then
+ AC_MSG_ERROR([Cannot compile a simple Qt executable. Check you
+have the right \$QTDIR !])
+ fi
+ else
+ AC_MSG_RESULT([$qt_cv_libname])
+ fi
+])
+
+dnl start here
+AC_DEFUN(QT_DO_IT_ALL,
+[
+ AC_ARG_WITH(qt-dir, [ --with-qt-dir where the root of Qt is
+installed ],
+ [ qt_cv_dir=`eval echo "$withval"/` ])
+
+ AC_ARG_WITH(qt-includes, [ --with-qt-includes where the Qt includes are.
+],
+ [ qt_cv_includes=`eval echo "$withval"` ])
+
+ AC_ARG_WITH(qt-libraries, [ --with-qt-libraries where the Qt library is
+installed.],
+ [ qt_cv_libraries=`eval echo "$withval"` ])
+
+ dnl pay attention to $QTDIR unless overridden
+ if test -z "$qt_cv_dir"; then
+ qt_cv_dir=$QTDIR
+ fi
+
+ dnl derive inc/lib if needed
+ if test -n "$qt_cv_dir"; then
+ if test -z "$qt_cv_includes"; then
+ qt_cv_includes=$qt_cv_dir/include
+ fi
+ if test -z "$qt_cv_libraries"; then
+ qt_cv_libraries=$qt_cv_dir/lib
+ fi
+ fi
+
+ dnl flags for compilation
+ QT_INCLUDES=
+ QT_LDFLAGS=
+ if test -n "$qt_cv_includes"; then
+ QT_INCLUDES="-I$qt_cv_includes"
+ fi
+ if test -n "$qt_cv_libraries"; then
+ QT_LDFLAGS="-L$qt_cv_libraries"
+ fi
+ AC_SUBST(QT_INCLUDES)
+ AC_SUBST(QT_LDFLAGS)
+
+ QT_FIND_MOC
+ MOC=$ac_moc
+ AC_SUBST(MOC)
+ QT_FIND_UIC
+ UIC=$ac_uic
+ AC_SUBST(UIC)
+
+ QT_CHECK_COMPILE
+
+ QT_LIB=$qt_cv_libname;
+ AC_SUBST(QT_LIB)
+])
Index: config/qt2.m4
===================================================================
RCS file: config/qt2.m4
diff -N config/qt2.m4
--- config/qt2.m4 14 Aug 2002 11:24:22 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,351 +0,0 @@
-# Configure paths and libs when using Qt GUI
-## -*- shell-script -*-
-
-## Based on KDE file written by :
-## Copyright (C) 1997 Janos Farkas ([EMAIL PROTECTED])
-## (C) 1997 Stephan Kulow ([EMAIL PROTECTED])
-
-## This file is free software; you can redistribute it and/or
-## modify it under the terms of the GNU Library General Public
-## License as published by the Free Software Foundation; either
-## version 2 of the License, or (at your option) any later version.
-
-## This library is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## Library General Public License for more details.
-
-## You should have received a copy of the GNU Library General Public License
-## along with this library; see the file COPYING.LIB. If not, write to
-## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-## Boston, MA 02111-1307, USA.
-
-AC_DEFUN(QT2_MOC_ERROR_MESSAGE,
-[
- AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_qt2moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN(QT2_FIND_PATH,
-[
- AC_MSG_CHECKING([for $1])
- AC_CACHE_VAL(qt2_cv_path_$1,
- [
- qt2_cv_path_$1="NONE"
- if test -n "$$2"; then
- qt2_cv_path_$1="$$2";
- else
- dirs="$3"
- qt2_save_IFS=$IFS
- IFS=':'
- for dir in $PATH; do
- dirs="$dirs $dir"
- done
- IFS=$qt2_save_IFS
-
- for dir in $dirs; do
- if test -x "$dir/$1"; then
- if test -n "$5"
- then
- evalstr="$dir/$1 $5 2>&1 "
- if eval $evalstr; then
- qt2_cv_path_$1="$dir/$1"
- break
- fi
- else
- qt2_cv_path_$1="$dir/$1"
- break
- fi
- fi
- done
-
- fi
-
- ])
-
- if test -z "$qt2_cv_path_$1" || test "$qt2_cv_path_$1" = "NONE"; then
- AC_MSG_RESULT(not found)
- $4
- else
- AC_MSG_RESULT($qt2_cv_path_$1)
- $2=$qt2_cv_path_$1
- fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the UIC compiler if available
-dnl ------------------------------------------------------------------------
-AC_DEFUN(QT2_AC_PATH_UIC,
-[
- QT2_FIND_PATH(uic, UIC, [$ac_qt2_bindir $QTDIR/bin \
- /usr/bin /usr/X11R6/bin /usr/lib/qt2/bin \
- /usr/local/qt2/bin /usr/local/qt/bin /usr/lib/qt/bin], )
- AC_SUBST(UIC)
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler in the PATH, in $QTDIR/bin, and some
-dnl more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN(QT2_AC_PATH_MOC,
-[
- QT2_FIND_PATH(moc, MOC, [$ac_qt2_bindir $QTDIR/bin \
- /usr/bin /usr/X11R6/bin /usr/lib/qt2/bin \
- /usr/local/qt2/bin /usr/local/qt/bin /usr/lib/qt/bin],)
-
- QT2_FIND_PATH(moc2, MOC2, [$ac_qt2_bindir $QTDIR/bin \
- /usr/bin /usr/X11R6/bin /usr/lib/qt2/bin \
- /usr/local/qt2/bin /usr/local/qt/bin /usr/lib/qt/bin],)
-
- if ! test -z "$MOC2"; then
- MOC="$MOC2";
- fi
-
- if test -z "$MOC"; then
- if test -n "$ac_cv_path_qt2moc"; then
- output=`eval "$ac_cv_path_qt2moc --help 2>&1 | sed -e '1q' | grep Qt"`
- fi
- echo "configure:__oline__: tried to call $ac_cv_path_qt2moc --help 2>&1 | sed -e
'1q' | grep Qt" >&AC_FD_CC
- echo "configure:__oline__: moc output: $output" >&AC_FD_CC
-
- if test -z "$output"; then
- QT2_MOC_ERROR_MESSAGE
- fi
- fi
-
- AC_SUBST(MOC)
-])
-
-AC_DEFUN(QT2_PRINT_PROGRAM,
-[
-AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qmovie.h>
-#include <qapplication.h>
-int main() {
- QMovie m;
- m.setSpeed(20);
- return 0;
-}
-EOF
-])
-
-dnl check for -lqt2 not -lqt
-AC_DEFUN(QT2_CHECK_LIB_NAME,
-[
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt2_incdir"
-LDFLAGS="-L$qt2_libdir $X_LDFLAGS"
-LIBS="$LIBS -lqt2 -lXext -lX11 $LIBSOCKET"
-
-QT2_PRINT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
- ac_qt2_name="-lqt2"
-else
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.$ac_ext >&AC_FD_CC
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-])
-
-## ------------------------------------------------------------------------
-## Try to find the Qt2 headers and libraries.
-## $(QT2_LDFLAGS) will be -Lqt2liblocation (if needed)
-## and $(QT2_INCLUDES) will be -Iqt2hdrlocation (if needed)
-## ------------------------------------------------------------------------
-##
-AC_DEFUN(QT2_AC_PATH,
-[
-AC_MSG_CHECKING([for Qt])
-ac_qt2_includes=NO ac_qt2_libraries=NO ac_qt2_bindir=NO
-qt2_libraries=""
-qt2_includes=""
-
-AC_ARG_WITH(qt-dir,
- [ --with-qt-dir where the root of Qt 2/3 is installed ],
- [ ac_qt2_includes=`eval echo "$withval"/include`
- ac_qt2_libraries=`eval echo "$withval"/lib`
- ac_qt2_bindir=`eval echo "$withval"/bin`
- ])
-
-AC_ARG_WITH(qt-includes,
- [ --with-qt-includes where the Qt 2/3 includes are. ],
- [
- ac_qt2_includes=`eval echo "$withval"`
- ])
-
-qt2_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
- [ --with-qt-libraries where the Qt 2/3 library is installed.],
- [ ac_qt2_libraries=`eval echo "$withval"`
- qt2_libs_given=yes
- ])
-
-if test "$ac_qt2_includes" = NO || test "$ac_qt2_libraries" = NO; then
-
-AC_CACHE_VAL(ac_cv_have_qt2,
-[#try to guess Qt2 locations
-
-qt2_incdirs="$ac_qt2_includes /usr/lib/qt2/include /usr/local/qt2/include
/usr/include/qt2 /usr/X11R6/include/X11/qt2 /usr/lib/qt/include /usr/local/qt/include
/usr/include/qt /usr/include /usr/X11R6/include/X11/qt $x_includes $QTINC"
-test -n "$QTDIR" && qt2_incdirs="$QTDIR/include/qt2 $QTDIR/include/qt $QTDIR/include
$QTDIR $qt2_incdirs"
-AC_FIND_FILE(qmovie.h, $qt2_incdirs, qt2_incdir)
-ac_qt2_includes="$qt2_incdir"
-
-if test ! "$ac_qt2_libraries" = "NO"; then
- qt2_libdirs="$ac_qt2_libraries"
-fi
-
-qt2_libdirs="$qt2_libdirs /usr/lib/qt2/lib /usr/lib/qt/lib /usr/X11R6/lib /usr/lib
/usr/local/qt2/lib /usr/lib/qt2 /usr/local/qt/lib /usr/lib/qt $x_libraries $QTLIB"
-test -n "$QTDIR" && qt2_libdirs="$QTDIR/lib $QTDIR $qt2_libdirs"
-
-test=NONE
-qt2_libdir=NONE
-for dir in $qt2_libdirs; do
- try="ls -1 $dir/libqt*"
- if test=`eval $try 2> /dev/null`; then qt2_libdir=$dir; break; else echo "tried
$dir" >&AC_FD_CC ; fi
-done
-
-ac_qt2_name="-lqt"
-
-AC_FIND_FILE(libqt.so.3 libqt.so.2.2.3 libqt.so.2.2 libqt.so.2 libqt2.so libqt.a
libqt.sl, $qt2_libdirs, qt2_libdir)
-
-ac_qt2_libraries="$qt2_libdir"
-
-QT2_CHECK_LIB_NAME
-
-if test "$ac_qt2_name" = "-lqt"; then
- ac_qt2_libraries="$qt2_libdir"
-
- ac_cxxflags_safe="$CXXFLAGS"
- ac_ldflags_safe="$LDFLAGS"
- ac_libs_safe="$LIBS"
-
- CXXFLAGS="$CXXFLAGS -I$qt2_incdir"
- LDFLAGS="-L$qt2_libdir $X_LDFLAGS"
- LIBS="$LIBS -lqt -lXext -lX11 $LIBSOCKET"
-
- QT2_PRINT_PROGRAM
-
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
- rm -f conftest*
- else
- echo "configure: failed program was:" >&AC_FD_CC
- cat conftest.$ac_ext >&AC_FD_CC
- ac_qt2_libraries="NO"
- fi
- rm -f conftest*
- CXXFLAGS="$ac_cxxflags_safe"
- LDFLAGS="$ac_ldflags_safe"
- LIBS="$ac_libs_safe"
-fi
-
-if test "$ac_qt2_includes" = NO || test "$ac_qt2_libraries" = NO; then
- ac_cv_have_qt2="have_qt2=no"
- ac_qt2_notfound=""
- if test "$ac_qt2_includes" = NO; then
- if test "$ac_qt2_libraries" = NO; then
- ac_qt2_notfound="(headers and libraries)";
- else
- ac_qt2_notfound="(headers)";
- fi
- else
- ac_qt2_notfound="(libraries)";
- fi
-
- AC_MSG_ERROR([Qt2 $ac_qt2_notfound not found. Please check your installation! ]);
-else
- have_qt2="yes"
-fi
-])
-else
- dnl libs and headers supplied. Need to check lib name
- qt2_incdir="$ac_qt2_includes"
- qt2_libdir="$ac_qt2_libraries"
- ac_qt2_name="-lqt"
- QT2_CHECK_LIB_NAME
- have_qt2="yes"
-fi
-
-eval "$ac_cv_have_qt2"
-
-if test "$have_qt2" != yes; then
- AC_MSG_RESULT([$have_qt2]);
-else
- ac_cv_have_qt2="have_qt2=yes ac_qt2_name=$ac_qt2_name \
- ac_qt2_includes=$ac_qt2_includes ac_qt2_libraries=$ac_qt2_libraries"
- AC_MSG_RESULT([libraries $ac_qt2_name in $ac_qt2_libraries, headers
$ac_qt2_includes])
-
- qt2_libraries="$ac_qt2_libraries"
- qt2_includes="$ac_qt2_includes"
-fi
-
-dnl check it is Qt2
-
-SAVE_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -I$qt2_includes -L$qt2_libraries"
-dnl specify we are definitely C++ compiling first
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-#include <qglobal.h>
-],
-[
-#if (QT_VERSION < 221)
-break_me_(\\\);
-#endif
-],
-ac_qt2_ok=yes,
-ac_qt2_ok=no
-)
-test "$ac_qt2_ok" = no && AC_MSG_ERROR([Found an earlier version of Qt - you must
specify the path to Qt2])
-CXXFLAGS="$SAVE_CXXFLAGS"
-
-AC_SUBST(qt2_libraries)
-AC_SUBST(qt2_includes)
-
-if test "$qt2_includes" = "$x_includes" || test -z "$qt2_includes"; then
- QT2_INCLUDES="";
-else
- QT2_INCLUDES="-I$qt2_includes"
- all_includes="$QT2_INCLUDES $all_includes"
-fi
-
-if test "$qt2_libraries" = "$x_libraries" || test -z "$qt2_libraries"; then
- QT2_LDFLAGS=""
-else
- QT2_LDFLAGS="-L$qt2_libraries"
- all_libraries="$QT2_LDFLAGS $all_libraries"
-fi
-
-QT2_LIBS="$ac_qt2_name"
-
-AC_SUBST(QT2_INCLUDES)
-AC_SUBST(QT2_LDFLAGS)
-AC_SUBST(QT2_LIBS)
-QT2_AC_PATH_MOC
-QT2_AC_PATH_UIC
-])
-
-AC_DEFUN(QT2_DO_IT_ALL,
-[
-if test "$QT2DIR" != ""; then
- QTDIR=$QT2DIR
-fi
-QT2_AC_PATH
-])
