fix compatability reading of floats

[lyx.git] / lib / reLyX / configure.in

diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index 53ab8f750afd9b2265273a0a927f3102e00fb671..913a25e98676fc69447527a73c29ed42facc052d 100644 (file)
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -2,23 +2,39 @@ dnl Process with autoconf to generate configure script   -*- sh -*-
 AC_INIT(reLyX.in)
 AC_PREREQ(2.13) dnl We want to use autoconf 2.13
 AC_CONFIG_AUX_DIR(../../config)
+AC_EXEEXT
 
 dnl PACKAGE=reLyX
 dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
 
-AC_ARG_WITH(lyxname,
-  [  --with-lyxname          the name under which lyx will be installed],
-  [lyxname=$withval],[lyxname=lyx])
+AC_ARG_WITH(version-suffix,
+  [  --with-version-suffix[=<version>]  install lyx files as lyx<version>],
+  [lyxname="lyx$withval"
+   program_suffix=$withval],
+  [lyxname=lyx])
 
 dnl must make a macro that gets the reLyX version
 VERSION=2.0
 AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
+# if reLyX has already been generated in this directory, delete it first
+test -x reLyX && rm -f reLyX
+# Find an already installed reLyX
 AC_PREFIX_PROGRAM(reLyX)
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
+# we need to expand ${datadir} to put it into the reLyX wrapper.
+LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+AC_SUBST(LYX_DIR)
+
+# Work around a problem in automake 1.4: when invoking install-strip,
+# INSTALL_PROGRAM is changed to 'install -s', and since
+# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
+# which returns an error condition when stripping fails.
+INSTALL_SCRIPT='${INSTALL}'
+
 dnl Checks for programs.
 AC_PROG_INSTALL
 RELYX_CHECK_PERL