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

only run xforms tests once, prepare for gcc 3.5

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8853 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2004-07-26 11:29:52 +00:00
parent f67fd3cb29
commit 0718aa87bf
4 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,7 +1,12 @@
2004-07-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* configure.ac: add code that some xforms tests are run only once
even if both xforms and gtk are configured.
2004-06-09 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* Makefile.am (SUBDIRS): remove m4 directory (does not have a
Makefile.am).
Makefile.am).
2004-06-09 Lars Gullik Bjonnes <larsbj@gullik.net>

4
config/ChangeLog
View File

@ -1,3 +1,7 @@
2004-07-26 Lars Gullik Bjonnes <larsbj@gullik.net>
* lyxinclude.m4: setup for gcc 3.5 use as well
2004-07-24 Lars Gullik Bjonnes <larsbj@gullik.net>
* common.am (AM_ETAGSFLAGS): setup variable

11
config/lyxinclude.m4
View File

@ -212,12 +212,12 @@ if test x$GXX = xyes; then
3.1*) CXXFLAGS="$lyx_opt -finline-limit=500 -fno-exceptions";;
3.2*) CXXFLAGS="$lyx_opt -fno-exceptions";;
3.3*) CXXFLAGS="$lyx_opt -fno-exceptions";;
3.4*) CXXFLAGS="$lyx_opt -fno-exceptions";;
3.4*|3.5*) CXXFLAGS="$lyx_opt -fno-exceptions";;
*) CXXFLAGS="$lyx_opt";;
esac
if test x$enable_debug = xyes ; then
case $gxx_version in
3.4*) CXXFLAGS="-g $CXXFLAGS"
3.4*|3.5*) CXXFLAGS="-g $CXXFLAGS"
AC_DEFINE(_GLIBCXX_DEBUG, 1, [libstdc++ debug mode])
AC_DEFINE(_GLIBCXX_DEBUG_PEDANTIC, 1, [libstdc++ pedantic debug mode])
;;
@ -229,9 +229,10 @@ if test x$GXX = xyes; then
case $gxx_version in
2.95.*) CXXFLAGS="$CXXFLAGS -W -Wall";;
2.96*) CXXFLAGS="$CXXFLAGS -W -Wall";;
3.1*) CXXFLAGS="$CXXFLAGS -W -Wall";;
3.4*) CXXFLAGS="$CXXFLAGS -Wextra -Wall";;
*) CXXFLAGS="$CXXFLAGS -W -Wall";;
3.1*) CXXFLAGS="$CXXFLAGS -W -Wall";;
3.2*) CXXFLAGS="$CXXFLAGS -W -Wall";;
3.3*) CXXFLAGS="$CXXFLAGS -W -Wall";;
*) CXXFLAGS="$CXXFLAGS -Wextra -Wall";;
esac
fi
fi])dnl

11
configure.ac
View File

@ -164,15 +164,16 @@ dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
for frontend in $FRONTENDS ; do
case "$frontend" in
xforms)
XFORMS_DO_IT_ALL
[ x$gtk_done = x1 ] || XFORMS_DO_IT_ALL
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
[ x$gtk_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
RPM_FRONTEND="xforms"
RPM_FRONTEND_DEPS='libforms >= 1.0'
FRONTEND_INFO="${FRONTEND_INFO}\
XForms Frontend:\n\
libXpm version:\t\t${XPM_VERSION}\n\
libforms version:\t\t${XFORMS_VERSION}\n"
xforms_done=1
;;
dnl gnome)
dnl XFORMS_DO_IT_ALL
@ -187,10 +188,11 @@ for frontend in $FRONTENDS ; do
dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
dnl ;;
gtk)
XFORMS_DO_IT_ALL
[ x$xforms_done = x1 ] || XFORMS_DO_IT_ALL
PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms gtk"
[ x$xforms_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
RPM_FRONTEND="gtk"
RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
@ -199,6 +201,7 @@ for frontend in $FRONTENDS ; do
GTK Frontend:\n\
libgtkmm version:\t\t${GTKMM_VERSION}\n\
libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
gtk_done=1
;;
qt)