X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=807c5b75cbfd56408d587fad1b4ee3a9bc660944;hb=a29f509e1bca722dd26c8b9c37590fc78b46ba0c;hp=190d61b079904f67343f41e464d7be05aec0531e;hpb=9117f717c75f9aa4b8734781cee393180b4350c7;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 190d61b079..807c5b75cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,27 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(lyx,1.4.0pre2,lyx-devel@lists.lyx.org)
+AC_INIT(lyx,1.4.0cvs,lyx-devel@lists.lyx.org)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AM_CONFIG_HEADER([src/config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
-PACKAGE=lyx${program_suffix}
-VERSION="1.4.0pre2"
+# first the version
+VERSION="1.4.0cvs"
 LYX_CHECK_VERSION
+AC_CANONICAL_TARGET
+# Check how the files should be packaged
+LYX_USE_PACKAGING
+LYX_VERSION_SUFFIX
 
 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
 
-LYX_VERSION_SUFFIX
-
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
+AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
 
 ### Set the execute permissions of the various scripts correctly
 for file in config/install-sh config/mkinstalldirs lib/configure ; do
@@ -178,20 +179,8 @@ for frontend in $FRONTENDS ; do
       libXpm version:\t\t${XPM_VERSION}\n\
       libforms version:\t\t${XFORMS_VERSION}\n"
 	  ;;
-  dnl   gnome)
-  dnl     XFORMS_DO_IT_ALL
-  dnl     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
-  dnl     AC_SUBST(GNOME_FRONTEND_CFLAGS)
-  dnl     AC_SUBST(GNOME_FRONTEND_LIBS)
-
-  dnl     FRONTEND="xforms gnome"
-  dnl     FRONTEND_GUILIB="gnome/*.lo"
-  dnl     FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
-  dnl     FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
-  dnl     FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
-  dnl	;;
     gtk)
-	  PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4)
+	  PKG_CHECK_MODULES(GTK_FRONTEND, gtkmm-2.4 libglademm-2.4 xft)
 	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-gtk\$(EXEEXT)"
 	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS gtk"
 	  RPM_FRONTEND="gtk"
@@ -227,8 +216,6 @@ dnl qt build will fail without moc or uic
   esac
 done
 
-### Check how the files should be packaged
-LYX_USE_PACKAGING
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'