### 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
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`
+ 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}\
GTK Frontend:\n\
libgtkmm version:\t\t${GTKMM_VERSION}\n\
FRONTEND_INFO="${FRONTEND_INFO}\
Qt Frontend:\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_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
#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
### 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 \
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 \