From 2652b096dba6fa543d4494cde6ef0e4da1dc5669 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 10 Jul 2003 11:27:51 +0000 Subject: [PATCH] handle --disable-x properly (helps qt/mac) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@7255 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 6 ++++++ config/configure.ac | 36 +++++++++++++++---------------- config/configure.in | 36 +++++++++++++++---------------- src/frontends/qt2/ChangeLog | 9 ++++++-- src/frontends/qt2/Menubar_pimpl.C | 1 + status.13x | 4 +++- 6 files changed, 52 insertions(+), 40 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index 13d46f4e66..a5d9bf3590 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2003-07-03 Jean-Marc Lasgouttes + + * configure.in: + * configure.ac: only add X libraries to LIBS if --disable-x has + not been passed to configure (useful for Qt/Mac) + 2003-05-26 Jean-Marc Lasgouttes * relyx_configure.ac: diff --git a/config/configure.ac b/config/configure.ac index 772d3634df..94a1a9c5e5 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -136,18 +136,24 @@ CHECK_WITH_PSPELL CHECK_WITH_CYGWIN ### Check for X libraries -# The real thing. AC_PATH_XTRA -LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" -# Since solaris X headers use int as implicit return type and modern -# gcc's do not like that, let's use -isystem instead of -I. -# We should test for gcc version and see whether it supports -isystem, -# but since at least gcc 2.6.x supports it and it is still too old for -# us, it seems we are safe. -if test -n "$GXX" ; then - X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` -fi -CPPFLAGS="$CPPFLAGS $X_CFLAGS" +case $have_x in + yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + # Since solaris X headers use int as implicit return type and modern + # gcc's do not like that, let's use -isystem instead of -I. + # We should test for gcc version and see whether it supports -isystem, + # but since at least gcc 2.6.x supports it and it is still too old for + # us, it seems we are safe. + if test -n "$GXX" ; then + X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` + fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS";; + no) LYX_ERROR(dnl +[Cannot find X window libraries and/or headers. Check your installation. + If you use a Linux system, check that you have installed + the development tools.]);; + disable) ;; +esac ### check which frontend we want to use @@ -197,14 +203,6 @@ dnl ;; LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac -### Check for xforms and xpm (only if X has been found). -if test "$have_x" = no ; then -LYX_ERROR(dnl -[Cannot find X window libraries and/or headers. Check your installation. - If you use a Linux system, check that you have installed - the development tools.]) -fi - ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) diff --git a/config/configure.in b/config/configure.in index aad009a82e..a3c7f5b5e2 100644 --- a/config/configure.in +++ b/config/configure.in @@ -141,16 +141,24 @@ CHECK_WITH_CYGWIN ### Check for X libraries # The real thing. AC_PATH_XTRA -LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" -# Since solaris X headers use int as implicit return type and modern -# gcc's do not like that, let's use -isystem instead of -I. -# We should test for gcc version and see whether it supports -isystem, -# but since at least gcc 2.6.x supports it and it is still too old for -# us, it seems we are safe. -if test -n "$GXX" ; then - X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` -fi -CPPFLAGS="$CPPFLAGS $X_CFLAGS" +case $have_x in + yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + # Since solaris X headers use int as implicit return type and modern + # gcc's do not like that, let's use -isystem instead of -I. + # We should test for gcc version and see whether it supports -isystem, + # but since at least gcc 2.6.x supports it and it is still too old for + # us, it seems we are safe. + if test -n "$GXX" ; then + X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'` + fi + CPPFLAGS="$CPPFLAGS $X_CFLAGS";; + no) LYX_ERROR(dnl +[Cannot find X window libraries and/or headers. Check your installation. + If you use a Linux system, check that you have installed + the development tools.]);; + disable) ;; +esac + ### check which frontend we want to use @@ -202,14 +210,6 @@ dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";; LYX_ERROR(Unknown frontend $lyx_use_frontend);; esac -### Check for xforms and xpm (only if X has been found). -if test "$have_x" = no ; then -LYX_ERROR(dnl -[Cannot find X window libraries and/or headers. Check your installation. - If you use a Linux system, check that you have installed - the development tools.]) -fi - ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_C diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 6f08b096c3..afc53a45f7 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,7 +1,12 @@ +2003-07-07 Jean-Marc Lasgouttes + + * Menubar_pimpl.C (Pimpl): when creating a top-level menu, make + sure that it is initialized to some reasonable value, so that the + (ugly) Qt/Mac code can do its magic + 2003-06-01 John Levon - * QGraphicsDialog.C: use relative file browsing - (bug 1028) + * QGraphicsDialog.C: use relative file browsing (bug 1028) 2003-04-29 Jean-Marc Lasgouttes diff --git a/src/frontends/qt2/Menubar_pimpl.C b/src/frontends/qt2/Menubar_pimpl.C index 4995019edd..3e93f38e81 100644 --- a/src/frontends/qt2/Menubar_pimpl.C +++ b/src/frontends/qt2/Menubar_pimpl.C @@ -51,6 +51,7 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe) pair menu = createMenu(owner_->menuBar(), &(*m), this, true); name_map_[m->submenuname()] = menu.second; + menu.second->showing(); } } diff --git a/status.13x b/status.13x index d457313a98..b76c3c4d48 100644 --- a/status.13x +++ b/status.13x @@ -25,7 +25,9 @@ What's new - add Proof layout to elsart class - add a bit of documentation of the AGU journals support in the - Extended manual + Extended manual; french documentation and examples update + +- french localization update ** Bug fixes