X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=fa631bb063f1987ec85b702ac59c0a899769344c;hb=0cfc9133bb381503f3fb48f824f3ad1e32b4f960;hp=d37ee87019687cc64f86a70a0358e266794aa662;hpb=183d7b115a675089a6eca12910e9452ff019c898;p=lyx.git diff --git a/configure.ac b/configure.ac index d37ee87019..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 @@ -173,7 +177,6 @@ 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:\t\t${XPM_VERSION}\n\ @@ -192,13 +195,12 @@ for frontend in $FRONTENDS ; do dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" dnl ;; gtk) - 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 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\ @@ -210,7 +212,6 @@ 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" @@ -315,7 +316,6 @@ ${FRONTEND_INFO}\ AC_SUBST(VERSION_INFO) AC_SUBST(RPM_FRONTEND) -AC_SUBST(RPM_FRONTEND_DEPS) ## Some config.h stuff @@ -413,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 \