anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt config fix reported by Mike Meredith

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5882 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-12-19 23:41:18 +00:00
parent 93aabdb0d8
commit 0b7bc9ebfa
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-12-19 John Levon <levon@movementarian.org>
* config/qt.m4: fix so lib is placed correctly. IRIX
whines at us
2002-12-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr> 2002-12-19 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* NEWS: update * NEWS: update

9
config/qt.m4
View File

@ -81,7 +81,8 @@ AC_DEFUN(QT_FIND_MOC,
dnl check a particular libname dnl check a particular libname
AC_DEFUN(QT_TRY_LINK, AC_DEFUN(QT_TRY_LINK,
[ [
CXXFLAGS="$BASE_CXXFLAGS $1" SAVE_LIBS="$LIBS"
LIBS="$LIBS $1"
AC_TRY_LINK([ AC_TRY_LINK([
#include <qglobal.h> #include <qglobal.h>
#include <qstring.h> #include <qstring.h>
@ -94,7 +95,7 @@ AC_DEFUN(QT_TRY_LINK,
], ],
qt_cv_libname=$1, qt_cv_libname=$1,
) )
CXXFLAGS="$BASE_CXXFLAGS" LIBS="$SAVE_LIBS"
]) ])
dnl check we can do a compile dnl check we can do a compile
@ -106,7 +107,7 @@ AC_DEFUN(QT_CHECK_COMPILE,
[ [
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
SAVE_CXXFLAGS=$CXXFLAGS SAVE_CXXFLAGS=$CXXFLAGS
BASE_CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS" CXXFLAGS="$CXXFLAGS $QT_INCLUDES $QT_LDFLAGS"
for libname in -lqt3 -lqt2 -lqt -lqt-mt; for libname in -lqt3 -lqt2 -lqt -lqt-mt;
do do
@ -210,5 +211,7 @@ AC_DEFUN(QT_DO_IT_ALL,
QT_LIB=$qt_cv_libname; QT_LIB=$qt_cv_libname;
AC_SUBST(QT_LIB) AC_SUBST(QT_LIB)
if test -n "$qt_cv_libname"; then
QT_GET_VERSION QT_GET_VERSION
fi
]) ])