# 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}
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
LYX_CXX_EXPLICIT
-LYX_CXX_CHEADERS
LYX_CXX_GLOBAL_CSTD
LYX_STD_COUNT
dnl we disable rtti for now
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>"])
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
RPM_FRONTEND="xforms"
- RPM_FRONTEND_DEPS='libforms >= 1.0'
FRONTEND_INFO="${FRONTEND_INFO}\
XForms Frontend:\n\
libXpm version:\t\t${XPM_VERSION}\n\
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
RPM_FRONTEND="gtk"
- RPM_FRONTEND_DEPS='gtkmm >= 2.4.0'
GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
FRONTEND_INFO="${FRONTEND_INFO}\
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt\$(EXEEXT)"
FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt2"
RPM_FRONTEND="qt"
- RPM_FRONTEND_DEPS='qt >= 2.2.1'
FRONTEND_INFO="${FRONTEND_INFO}\
Qt Frontend:\n\
Qt version:\t\t${QT_VERSION}\n"
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)
AC_TYPE_SIZE_T
AC_TYPE_UID_T
-AC_CHECK_FUNCS(snprintf vsnprintf strerror)
-LYX_CHECK_DECL(snprintf, stdio.h)
-LYX_CHECK_DECL(vsnprintf, stdio.h)
+AC_CHECK_FUNCS(strerror)
LYX_CHECK_DECL(istreambuf_iterator, iterator)
LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
+# Check the form of mkdir()
+AC_FUNC_MKDIR
+
AC_ARG_ENABLE(compression-support, AC_HELP_STRING([--enable-compression-support],[Support for compressed files.]),[
case "${enableval}" in
yes) use_compression=true ;;
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(memmove memset strchr mkfifo mkstemp mktemp)
+AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
AC_LANG_POP(C)
AC_FUNC_SELECT_ARGTYPES
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"
AC_SUBST(VERSION_INFO)
AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
## Some config.h stuff
/************************************************************
** You should not need to change anything beyond this point */
-#ifndef HAVE_STRCHR
-# define strchr(a,b) index(a,b)
-#endif
-
-#ifndef HAVE_MEMMOVE
-# define memmove(a,b,c) bcopy(b,a,c)
-#endif
-
#ifndef HAVE_STRERROR
#if defined(__cplusplus)
extern "C"
char * strerror(int n);
#endif
-#ifdef BROKEN_HEADERS
-#include "broken_headers.h"
-#endif
-
#ifdef HAVE_MKSTEMP
#ifndef HAVE_DECL_MKSTEMP
#if defined(__cplusplus)
#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 \