test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs config/hack-gcc \
- lib/configure ; do
+for file in config/install-sh config/mkinstalldirs lib/configure ; do
chmod 755 ${srcdir}/${file}
done
### Check for programs
AC_PROG_MAKE_SET
AC_PROG_INSTALL
-AC_PROG_RANLIB
+#AC_PROG_RANLIB
AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
if test "x$KPSEWHICH" = xkpsewhich ; then
AC_DEFINE(HAVE_KPSEWHICH, 1,
AC_LANG_CPLUSPLUS
LYX_PROG_CXX
AC_PROG_CXXCPP
-
-### Compiler Characteristics
-AC_C_CONST
-AC_C_INLINE
+AC_DISABLE_SHARED
+AC_LIBTOOL_WIN32_DLL
+AM_PROG_LIBTOOL
### check the size of pointers and ints
# the defaults are given for cross compilation.
-AC_CHECK_SIZEOF(void *, 4)
-AC_CHECK_SIZEOF(int, 4)
LYX_CXX_MUTABLE
LYX_CXX_PARTIAL
LYX_CXX_EXPLICIT
-LYX_CXX_STL_STACK
+dnl we do not use stl stack, or at least not on gcc 2.7, which was the
+dnl cause for this test.
+dnl LYX_CXX_STL_STACK
LYX_CXX_STL_STRING
LYX_CXX_NAMESPACES
-LYX_CXX_RTTI
-
-### check for compiler brokenness
-LYX_GXX_STRENGTH_REDUCE
-
-### Libarary Files
+LYX_CXX_CHEADERS
+LYX_STD_COUNT
+dnl we disable rtti for now
+dnl LYX_CXX_RTTI
+AC_CHECK_HEADERS(ostream istream)
+LYX_CXX_STL_MODERN_STREAMS
+
+### Library Files
dnl by testing these we check if it is ok to have
dnl -lc and -lm as args to the compiler
AC_CHECK_LIB(m, sin)
AC_CHECK_LIB(c, fopen)
-# A hack to work around gcc compiler errors
-AC_ARG_WITH(gcc-hack,[ --with-gcc-hack add a wrapper around gcc])
-if test "x$with_gcc_hack" = xyes ; then
- CXX_COMMAND='${top_srcdir}/config/hack-gcc ${CXX}'
- lyx_flags="$lyx_flags gcc-hack"
-else
- CXX_COMMAND='${CXX}'
-fi
-AC_SUBST(CXX_COMMAND)
-
### Add extra directories to check for libraries.
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
LYX_LOOP_DIR($lyx_cv_extra_lib,LYX_ADD_LIB_DIR(lyx_ldflags,$dir))
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
## Check whether X is new enough to handle the input method stuff
-AC_CHECK_FUNC(XOpenIM)
+AC_CHECK_FUNCS(XOpenIM)
### Check for xforms and xpm (only if X has been found).
if test "$have_x" = yes ; then
the development tools.])
fi
-
### Setup GNU gettext
dnl GNUÂ gettext is written in C
AC_LANG_C
+# Some tests that may be useful for gettext
+AC_C_CONST
+AC_C_INLINE
+# Do the real setup now
AM_GNU_GETTEXT
# a hack for those who try to change LyX, but do not have gettext installed
case "${XGETTEXT}" in
AC_HEADER_MAJOR
AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h)
+# some annoying header files
+#LYX_PATH_HEADER(stl_string_fwd.h)
+LYX_STL_STRING_FWD
+
# some standard structures
AC_HEADER_STAT
AC_HEADER_TIME
# some functions we'd like to have
AC_ARG_WITH(broken-headers,
- [ --with-broken-headers define some functions on SunOS4 and SCO],
+ [ --with-broken-headers define some functions on SunOS4 and SCO],
[lyx_broken_headers=$withval])
if test "x$lyx_broken_headers" = "xyes"; then
lyx_flags="$lyx_flags broken-headers"
# SunOS 4.1.3 does not have strerror and atexit
AC_REPLACE_FUNCS(strerror atexit)
-dnl This check should be removed. If the compiler does not understand
-dnl bool it is so broken that we should not support it. (Lgb)
-dnl AC_CACHE_CHECK([for bool type],lyx_cv_have_bool,[
-dnl AC_TRY_LINK(, [bool foo = true;], lyx_cv_have_bool=yes,lyx_cv_have_bool=no)])
-dnl if test $lyx_cv_have_bool = 'yes' ; then
-dnl AC_DEFINE(HAVE_bool,1,
-dnl [Define if the bool type is known to your compiler])
-dnl fi
-
### and now some special lyx flags.
AC_ARG_WITH(two-colors,[ --with-two-colors use two color pixmaps],
- [AC_DEFINE(TWO_COLOR_ICONS)
+ [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_WITH(debug,[ --with-debug output debug information by default],
- [AC_DEFINE(DEBUG_AS_DEFAULT,1,
- [Define if you want debugging turned on as default.])
- lyx_flags="$lyx_flags debug"])
+AC_ARG_ENABLE(assertions,
+ [ --enable-assertions add runtime sanity checks in the program],,
+ [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+ enable_assertions=yes;
+ else
+ enable_assertions=no;
+ fi;])
+if test "x$enable_assertions" = xyes ; then
+ lyx_flags="$lyx_flags assertions"
+ AC_DEFINE(ENABLE_ASSERTIONS,1,
+ [Define if you want assertions to be enabled in the code])
+fi
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
AC_OUTPUT([Makefile \
+ development/lyx.spec \
lib/Makefile \
intl/Makefile \
po/Makefile.in \
projects / lyx.git / blobdiff