[Define this if you have the kpsewhich program working on your system.])
fi
+# Work around a problem in automake 1.4: when invoking install-strip,
+# INSTALL_PROGRAM is changed to 'install -s', and since
+# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
+# which returns an error condition when stripping fails.
+INSTALL_SCRIPT='${INSTALL}'
+
### we will also need a C compiler to compile GNU gettext
AC_PROG_CC
### 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
# some standard header files
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h)
# some annoying header files
#LYX_PATH_HEADER(stl_string_fwd.h)
AC_REPLACE_FUNCS(strerror atexit)
### and now some special lyx flags.
-AC_ARG_WITH(two-colors,[ --with-two-colors use two color pixmaps],
- [AC_DEFINE(TWO_COLOR_ICONS,1,
- [You might want to define TWO_COLOR_ICONS if you want to spare
- your colormap. This will use monochrome icons instead of colored ones.])
- lyx_flags="$lyx_flags two-colors"])
AC_ARG_ENABLE(assertions,
[ --enable-assertions add runtime sanity checks in the program],,
[if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; 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 \