+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
### 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
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
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 \
"\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"