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

Qt frontend is for Qt 3 as well, reflect that in the options

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4371 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-06-11 23:33:26 +00:00
parent d6120758ce
commit ddcd73acd7
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-12 John Levon <moz@compsoc.man.ac.uk>
* qt2.m4: Qt frontend is for Qt 2 OR Qt 3
2002-06-07 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr> 2002-06-07 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): complete rewrite. Now * xforms.m4 (LYX_USE_XFORMS_IMAGE_LOADER): complete rewrite. Now

18
config/qt2.m4
View File

@ -1,4 +1,4 @@
# Configure paths and libs when using Qt2 GUI # Configure paths and libs when using Qt GUI
## -*- shell-script -*- ## -*- shell-script -*-
## Based on KDE file written by : ## Based on KDE file written by :
@ -172,28 +172,28 @@ LIBS="$ac_libs_safe"
## ##
AC_DEFUN(QT2_AC_PATH, AC_DEFUN(QT2_AC_PATH,
[ [
AC_MSG_CHECKING([for Qt 2]) AC_MSG_CHECKING([for Qt])
ac_qt2_includes=NO ac_qt2_libraries=NO ac_qt2_bindir=NO ac_qt2_includes=NO ac_qt2_libraries=NO ac_qt2_bindir=NO
qt2_libraries="" qt2_libraries=""
qt2_includes="" qt2_includes=""
AC_ARG_WITH(qt2-dir, AC_ARG_WITH(qt-dir,
[ --with-qt2-dir where the root of Qt2 is installed ], [ --with-qt-dir where the root of Qt 2/3 is installed ],
[ ac_qt2_includes=`eval echo "$withval"/include` [ ac_qt2_includes=`eval echo "$withval"/include`
ac_qt2_libraries=`eval echo "$withval"/lib` ac_qt2_libraries=`eval echo "$withval"/lib`
ac_qt2_bindir=`eval echo "$withval"/bin` ac_qt2_bindir=`eval echo "$withval"/bin`
]) ])
AC_ARG_WITH(qt2-includes, AC_ARG_WITH(qt-includes,
[ --with-qt2-includes where the Qt2 includes are. ], [ --with-qt-includes where the Qt 2/3 includes are. ],
[ [
ac_qt2_includes=`eval echo "$withval"` ac_qt2_includes=`eval echo "$withval"`
]) ])
qt2_libs_given=no qt2_libs_given=no
AC_ARG_WITH(qt2-libraries, AC_ARG_WITH(qt-libraries,
[ --with-qt2-libraries where the Qt2 library is installed.], [ --with-qt-libraries where the Qt 2/3 library is installed.],
[ ac_qt2_libraries=`eval echo "$withval"` [ ac_qt2_libraries=`eval echo "$withval"`
qt2_libs_given=yes qt2_libs_given=yes
]) ])
@ -224,7 +224,7 @@ done
ac_qt2_name="-lqt" 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_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" ac_qt2_libraries="$qt2_libdir"