mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 09:15:50 +00:00
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
This commit is contained in:
Jean-Marc Lasgouttes
parent
f8ae88a921
commit
2652b096db
@ -1,3 +1,9 @@
|
||||
2003-07-03 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* 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 <lasgouttes@lyx.org>
|
||||
|
||||
* relyx_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)
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,7 +1,12 @@
|
||||
2003-07-07 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* 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 <levon@movementarian.org>
|
||||
|
||||
* QGraphicsDialog.C: use relative file browsing
|
||||
(bug 1028)
|
||||
* QGraphicsDialog.C: use relative file browsing (bug 1028)
|
||||
|
||||
2003-04-29 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
|
||||
@ -51,6 +51,7 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
|
||||
pair<int, QLPopupMenu *> menu =
|
||||
createMenu(owner_->menuBar(), &(*m), this, true);
|
||||
name_map_[m->submenuname()] = menu.second;
|
||||
menu.second->showing();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user