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

Fix solaris build problems; fix small sigc++ bug; remove -display from command-line help

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@872 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-07-10 14:17:35 +00:00
parent 146b245e5c
commit 2ebbccc212
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2000-07-10 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* sigc++/configure.in: fix bug in threading-related code (Yes, I
did submit that to Karl).
* configure.in: use -isystem instead of -I for X headers. This
fixes a problem on solaris with a recent gcc;
put the front-end code after the X detection code;
configure in sigc++ before lib/
* src/lyx_main.C (commandLineHelp): remove -display from command
line help.
2000-07-08 Dekel Tsur <dekel@math.tau.ac.il>
* src/text.C (GetColumnNearX): Better behavior when a RTL

32
configure.in
View File

@ -123,6 +123,25 @@ fi
### Check which libsigc++ we're using
LYX_WITH_SIGC
### Check for X libraries
# Check for the pt library (for SCO, needed for X)
AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
# 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"
## Check whether X is new enough to handle the input method stuff
AC_CHECK_FUNCS(XOpenIM)
### check which frontend we want to use
LYX_USE_FRONTEND
dnl The code below is not in a macro, because this would cause big
@ -143,17 +162,6 @@ case "$lyx_use_frontend" in
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
### Check for X libraries
# Check for the pt library (for SCO, needed for X)
AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
# The real thing.
AC_PATH_XTRA
LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
## Check whether X is new enough to handle the input method stuff
AC_CHECK_FUNCS(XOpenIM)
### Check for xforms and xpm (only if X has been found).
if test "$have_x" = yes ; then
# We surely need these two libraries and want to check carefully the
@ -249,7 +257,7 @@ if test "x$enable_assertions" = xyes ; then
fi
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX sigc++)
AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
AC_OUTPUT([Makefile \
development/lyx.spec \
lib/Makefile \

4
sigc++/configure.in
View File

@ -589,7 +589,7 @@ int main()
return 0;
}
],[
. ac_thread.sh
. ./ac_thread.sh
rm ac_thread.sh
AC_MSG_RESULT(found)
],[
@ -615,7 +615,7 @@ ac_thread_key_impl_size=
your thread library is not available. Please fill out the ac_thread.sh file.
])
else
. ac_thread.sh
. ./ac_thread.sh
fi
])
AC_DEFINE_UNQUOTED(SIGC_PTHREAD_COND_ATTR,$ac_thread_cond_attr_size)

1
src/lyx_main.C
View File

@ -594,7 +594,6 @@ void commandLineHelp()
"\t-help summarize LyX usage\n"
"\t-userdir dir try to set user directory to dir\n"
"\t-sysdir dir try to set system directory to dir\n"
"\t-display display use display as DISPLAY\n"
"\t-geometry WxH+X+Y set geometry of the main window\n"
"\t-dbg feature[,feature]...\n"
" select the features to debug.\n"