X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fa631bb063f1987ec85b702ac59c0a899769344c;hb=0cfc9133bb381503f3fb48f824f3ad1e32b4f960;hp=57477d899e338e854cb1f624403011bc157ae436;hpb=0718aa87bf1317641a88ceaca45b3cef202b251a;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 57477d899e..fa631bb063 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,6 +11,10 @@ PACKAGE=lyx${program_suffix}
 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
 
@@ -159,21 +163,24 @@ 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
   case "$frontend" in
     xforms)
-	  [ x$gtk_done = x1 ] || XFORMS_DO_IT_ALL
+	  XFORMS_DO_IT_ALL
 	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-	  [ x$gtk_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
+	  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\
       libforms version:\t\t${XFORMS_VERSION}\n"
-	  xforms_done=1
 	  ;;
   dnl   gnome)
   dnl     XFORMS_DO_IT_ALL
@@ -188,20 +195,16 @@ for frontend in $FRONTENDS ; do
   dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
   dnl	;;
     gtk)
-	  [ x$xforms_done = x1 ] || 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)"
-	  [ x$xforms_done = x1 ] || FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
 	  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`
+	  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"
-	  gtk_done=1
 	  ;;
 
     qt)
@@ -209,10 +212,16 @@ for frontend in $FRONTENDS ; do
 	  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"
+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');;
@@ -307,7 +316,6 @@ ${FRONTEND_INFO}\
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
 
 ## Some config.h stuff
 
@@ -405,6 +413,7 @@ AC_CONFIG_FILES([Makefile  m4/Makefile \
        po/Makefile.in \
        sourcedoc/Doxyfile \
        sourcedoc/Makefile \
+       src/client/Makefile \
        src/Makefile \
        src/version.C-tmp:src/version.C.in \
        src/tex2lyx/Makefile \