AM_INIT_AUTOMAKE($lyxname, $VERSION)
-# The list of languages known to LyX
-# This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
-
-# fix the value of the prefixes.
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-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 lib/configure ; do
chmod 755 ${srcdir}/${file}
if test x$lyx_use_aiksaurus != xno; then
AC_CHECK_LIB(Aiksaurus, main,
[AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
- AIKSAURUS_LIBS="-lAiksaurus -lbz2"
- ],,"-lbz2")
+ AIKSAURUS_LIBS="-lAiksaurus"
+ lyx_flags="$lyx_flags aiksaurus"
+ ])
AC_CHECK_HEADER(Aiksaurus.h,[
ac_cv_header_aiksaurus_h=yes
lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
-### Check if we want spell libraries, prefer new aspell
-CHECK_WITH_ASPELL
-if test "$USING_ASPELL" != "yes"; then
- CHECK_WITH_PSPELL
-fi
-
### Check for some Cygwin-specific details.
CHECK_WITH_CYGWIN
dnl if the gtk frontend has been specified, then xforms is needed too
if echo $FRONTENDS | grep gtk | grep -v xforms ; then
- FRONTENDS="$FRONTENDS xforms"
+ FRONTENDS="xforms $FRONTENDS"
fi
dnl The code below is not in a macro, because this would cause big
esac
done
+### Check how the files should be packaged
+LYX_USE_PACKAGING
+# fix the value of the prefixes.
+test "x$prefix" = xNONE && prefix=$default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
+ LYX_WARNING([The installation prefix \"${prefix}\" contains a space, which
+ causes problems with the Makefiles. The installation will be done in
+ directory \"`pwd`/installprefix\" instead. Please move its contents to
+ the right place after installation.])
+ prefix=`pwd`/installprefix
+fi
+
### Setup GNU gettext
dnl GNUÂ gettext is written in C
AC_LANG_PUSH(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
- *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
-esac
-
-AC_SUBST(LINGUAS)
-
AC_LANG_POP(C)
# some standard header files
AC_HEADER_DIRENT
AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h utime.h sys/utime.h io.h process.h)
# some standard structures
AC_HEADER_STAT
AC_CHECK_HEADERS(zlib.h, use_compression=true, use_compression=false)
AC_CHECK_LIB(z, gzopen,[use_compression=true;LIBS="$LIBS -lz"], use_compression=false)
if test $use_compression = true ; then
- AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to support compressed files.])
+ AC_DEFINE(USE_COMPRESSION, 1, [Define as 1 if you want to support compressed files.])
lyx_flags="$lyx_flags compression"
fi
fi
dnl We aim to remove this eventually, since we should test as much as
dnl possible with the compiler which will use the functions (JMarc)
AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+AC_CHECK_FUNCS(close _close getpid _getpid lstat mkfifo mkstemp mktemp open _open pclose _pclose popen _popen readlink)
+AC_LANG_POP(C)
+
+LYX_CHECK_SPELL_ENGINES
+
+lyx_client_subdir=true
+AC_LANG_PUSH(C)
+AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false])
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
AC_LANG_POP(C)
+
AC_FUNC_SELECT_ARGTYPES
### Some information on what just happened
Host type: ${host}\n\
Special build flags: ${lyx_flags}\n\
C Compiler: ${CC}\n\
- C Compiler flags: ${CFLAGS}\n\
+ C Compiler flags: ${CPPFLAGS} ${CFLAGS}\n\
C++ Compiler: ${CXX} ${CXX_VERSION}\n\
- C++ Compiler flags: ${CXXFLAGS}\n\
+ C++ Compiler flags: ${CPPFLAGS} ${CXXFLAGS}\n\
Linker flags: ${LDFLAGS}\n\
${FRONTEND_INFO}\
+ Packaging: ${lyx_use_packaging}\n\
LyX binary dir: ${real_bindir}\n\
LyX files dir: ${real_datadir}\n"
#define BOOST_NO_WREGEX 1
#define BOOST_NO_WSTRING 1
+#ifdef __CYGWIN__
+#define BOOST_POSIX 1
+#endif
+
#endif
])
src/graphics/Makefile \
src/insets/Makefile \
src/support/Makefile \
+ src/support/tests/Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \
- src/frontends/gnome/Makefile \
])
AC_OUTPUT