VERSION="1.4.0cvs"
LYX_CHECK_VERSION
+dnl default maintainer mode to true for development versions
+if test "${enable_maintainer_mode+set}" != set; then
+ enable_maintainer_mode=$lyx_devel_version
+fi
AM_MAINTAINER_MODE
AC_CANONICAL_TARGET
dnl compiler allow that)
dnl LYX_CXX_PARTIAL
LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
LYX_CXX_CHEADERS
LYX_CXX_GLOBAL_CSTD
LYX_STD_COUNT
### check which frontend we want to use
+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"
+fi
+
dnl The code below is not in a macro, because this would cause big
dnl problems with the AC_REQUIRE contained in QT_DO_IT_ALL.
for frontend in $FRONTENDS ; do
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: ${XPM_VERSION}\n\
- libforms version: ${XFORMS_VERSION}\n"
+ libXpm version:\t\t${XPM_VERSION}\n\
+ libforms version:\t\t${XFORMS_VERSION}\n"
;;
dnl gnome)
dnl XFORMS_DO_IT_ALL
dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
dnl ;;
gtk)
- XFORMS_DO_IT_ALL
- PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.0 libglademm-2.0)
+ PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4)
FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
- FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms gtk"
+ FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
RPM_FRONTEND="gtk"
- RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
- GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
- LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
- FRONTEND_INFO=" libgtkmm version: ${GTKMM_VERSION}\n\
- libglademm version: ${LIBGLADEMM_VERSION}\n"
+ GTKMM_VERSION=`pkg-config --modversion gtkmm-2.4`
+ LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.4`
+ FRONTEND_INFO="${FRONTEND_INFO}\
+ GTK Frontend:\n\
+ libgtkmm version:\t\t${GTKMM_VERSION}\n\
+ libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
;;
qt)
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: ${QT_VERSION}\n"
+ Qt version:\t\t${QT_VERSION}\n"
+dnl qt build will fail without moc or uic
+ if test -z "$MOC"; then
+ LYX_ERROR([moc binary not found !])
+ fi
+ if test -z "$UIC"; then
+ LYX_ERROR([uic binary not found !])
+ fi
;;
*)
LYX_ERROR(Unknown frontend '$frontend');;
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])
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 supprot compressed files.])
+ AC_DEFINE(USE_COMRESSION, 1, [Define as 1 if you want to support compressed files.])
lyx_flags="$lyx_flags compression"
fi
fi
AC_SUBST(VERSION_INFO)
AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
## Some config.h stuff
#include "support/os2_defines.h"
#endif
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#include "support/nt_defines.h"
-#endif
-
#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
#define USE_BOOST_FORMAT 1
#else
#define USE_BOOST_FORMAT 0
#endif
+#define BOOST_USER_CONFIG <config.h>
+
+#if defined(ENABLE_ASSERTIONS)
+#define BOOST_ENABLE_ASSERT_HANDLER 1
+#else
+#define BOOST_DISABLE_ASSERTS 1
+#endif
+
#define BOOST_DISABLE_THREADS 1
#define BOOST_NO_WREGEX 1
#define BOOST_NO_WSTRING 1
### Finish the work.
AC_CONFIG_SUBDIRS(lib lib/reLyX)
-AC_CONFIG_FILES([Makefile \
+AC_CONFIG_FILES([Makefile m4/Makefile \
boost/Makefile \
boost/libs/Makefile \
+ boost/libs/filesystem/Makefile \
+ boost/libs/filesystem/src/Makefile \
boost/libs/regex/Makefile \
boost/libs/regex/src/Makefile \
boost/libs/signals/Makefile \
development/Makefile \
development/lyx.spec \
lib/Makefile \
+ lib/doc/Makefile \
intl/Makefile \
po/Makefile.in \
sourcedoc/Doxyfile \
sourcedoc/Makefile \
+ src/client/Makefile \
src/Makefile \
src/version.C-tmp:src/version.C.in \
src/tex2lyx/Makefile \
src/frontends/xforms/lyx_xpm.h-tmp:src/frontends/xforms/lyx_xpm.h.in \
src/frontends/xforms/forms/Makefile \
src/frontends/gtk/Makefile \
+ src/frontends/gtk/gimages/Makefile \
src/frontends/gtk/glade/Makefile \
src/frontends/qt2/Makefile \
src/frontends/qt2/moc/Makefile \