Rob, this patch should hopefully fix it so we prefer -lqt2 when available.
Can you test it (don't forget to ./autogen.sh ;)
thanks
john
--
"What, so the microchips are in the MCU ?"
- Sam Burton learning about the PC architecture
Index: config/qt2.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/qt2.m4,v
retrieving revision 1.5
diff -u -r1.5 qt2.m4
--- config/qt2.m4 2001/09/09 22:02:09 1.5
+++ config/qt2.m4 2001/09/17 00:27:09
@@ -20,11 +20,6 @@
## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
## Boston, MA 02111-1307, USA.
-## ------------------------------------------------------------------------
-## Find a file (or one of more files in a list of dirs)
-## ------------------------------------------------------------------------
-##
-
AC_DEFUN(QT2_MOC_ERROR_MESSAGE,
[
AC_MSG_ERROR([No Qt meta object compiler (moc) found!
@@ -135,54 +130,6 @@
EOF
])
-AC_DEFUN(QT2_CHECK_DIRECT,
-[
-AC_MSG_CHECKING([if Qt2 compiles without flags])
-AC_CACHE_VAL(cv_qt2_direct,
-[
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt2_includes"
-LDFLAGS="$X_LDFLAGS"
-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-QT2_PRINT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
- cv_qt2_direct="yes"
-else
- cv_qt2_direct="no"
- 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"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-])
-
-if test "$cv_qt2_direct" = "yes"; then
- AC_MSG_RESULT(yes)
- $1
-else
- AC_MSG_RESULT(no)
- $2
-fi
-])
-
## ------------------------------------------------------------------------
## Try to find the Qt2 headers and libraries.
## $(QT2_LDFLAGS) will be -Lqt2liblocation (if needed)
@@ -241,31 +188,64 @@
if test=`eval $try 2> /dev/null`; then qt2_libdir=$dir; break; else echo "tried
$dir" >&AC_FD_CC ; fi
done
-dnl AC_FIND_FILE(libqt.so.2.2.3 libqt.so.2.2 libqt.so.2 libqt2.so libqt.a libqt.sl,
$qt2_libdirs, qt2_libdir)
+ac_qt2_name="-lqt"
+
+AC_FIND_FILE(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"
+dnl check for -lqt2 not -lqt
+
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"
+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
- ac_qt2_libraries="NO"
fi
rm -f conftest*
CXXFLAGS="$ac_cxxflags_safe"
LDFLAGS="$ac_ldflags_safe"
LIBS="$ac_libs_safe"
+dnl end check for -lqt2
+
+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=""
@@ -293,7 +273,7 @@
if test "$have_qt2" != yes; then
AC_MSG_RESULT([$have_qt2]);
else
- ac_cv_have_qt2="have_qt2=yes \
+ 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_libraries, headers $ac_qt2_includes])
@@ -301,10 +281,6 @@
qt2_includes="$ac_qt2_includes"
fi
-if test ! "$qt2_libs_given" = "yes"; then
-QT2_CHECK_DIRECT(qt2_libraries= ,[])
-fi
-
dnl check it is Qt2
SAVE_CXXFLAGS="$CXXFLAGS"
@@ -342,7 +318,7 @@
all_libraries="$QT2_LDFLAGS $all_libraries"
fi
-QT2_LIBS="-lqt"
+QT2_LIBS="$ac_qt2_name"
AC_SUBST(QT2_INCLUDES)
AC_SUBST(QT2_LDFLAGS)
