Use the preferred calling for Boost.Signal

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5728ba83f88b2dcc131a7a680b838f719bc47c9d..4d578cadd4bda4a11a068641114d12fde106a734 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,11 @@ esac
 
 ### 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
@@ -187,10 +192,9 @@ 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)
          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`
@@ -210,6 +214,13 @@ for frontend in $FRONTENDS ; do
          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');;
@@ -397,10 +408,12 @@ AC_CONFIG_FILES([Makefile  m4/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 \