X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=978babc5726585c70c237453d9c421c0b7982559;hb=61133c4b5625993f600ffa7d209c3e2bc28d26f6;hp=9d1b05738322830476883f665df51f0f601e66b6;hpb=a5b1022b9f3358da18464c5b589cf86b376cf677;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 9d1b057383..978babc572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT(LyX,1.4.0cvs,[lyx-devel@lists.lyx.org],[lyx])
+AC_INIT(LyX,1.4.0svn,[lyx-devel@lists.lyx.org],[lyx])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.C)
 AC_CONFIG_HEADERS([src/config.h])
@@ -9,11 +9,13 @@ AC_CONFIG_AUX_DIR(config)
 
 # First check the version
 LYX_CHECK_VERSION
-AC_CANONICAL_TARGET
-
+LYX_VERSION_SUFFIX
 # Check how the files should be packaged
+AC_CANONICAL_TARGET
 LYX_USE_PACKAGING
-LYX_VERSION_SUFFIX
+# We need to define these variables here and the no-define option of
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING. 
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
 
 dnl default maintainer mode to true for development versions
 if test "${enable_maintainer_mode+set}" != set; then
@@ -21,7 +23,9 @@ if test "${enable_maintainer_mode+set}" != set; then
 fi
 AM_MAINTAINER_MODE
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar])
+save_PACKAGE=$PACKAGE
+AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9])
+PACKAGE=$save_PACKAGE
 
 ### Set the execute permissions of the various scripts correctly
 for file in config/install-sh config/mkinstalldirs lib/configure ; do
@@ -157,21 +161,13 @@ 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="xforms $FRONTENDS"
-  noxformsbin=yes
-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)
 	  XFORMS_DO_IT_ALL
-	  if test -z "$noxformsbin" ; then
-	    FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
-	  fi
+	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-xforms\$(EXEEXT)"
 	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS xforms"
 	  RPM_FRONTEND="xforms"
 	  FRONTEND_INFO="${FRONTEND_INFO}\
@@ -307,7 +303,8 @@ AC_FUNC_SELECT_ARGTYPES
 
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+real_pkgdatadir=`eval "echo \`eval \"echo ${pkgdatadir}\"\`"`
+real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 VERSION_INFO="Configuration\n\
   Host type:                      ${host}\n\
   Special build flags:            ${lyx_flags}\n\
@@ -322,12 +319,11 @@ VERSION_INFO="Configuration\n\
 ${FRONTEND_INFO}\
   Packaging:                      ${lyx_use_packaging}\n\
   LyX binary dir:                 ${real_bindir}\n\
-  LyX files dir:                  ${real_datadir}\n"
+  LyX files dir:                  ${real_pkgdatadir}\n"
 
-real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"`
 MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir})
 MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir})
-MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_datadir})
+MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_pkgdatadir})
 
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)