From 49b9dbdf104e55708cc0d8dc67706029ead80812 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 18 Nov 1999 11:42:36 +0000
Subject: [PATCH] Two configuration fixes. Bugfree configure is coming soon (do
 you really believe in that??)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@323 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog              | 29 +++++++++++++++++++++++++++++
 lib/reLyX/configure.in |  6 +++++-
 src/insets/Makefile.am |  1 -
 src/mathed/Makefile.am |  1 -
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d57920702..016a653563 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
+1999-11-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/{insets,mathed}/Makefile.am: do not declare an empty
+	LDFLAGS, so that it can be set at configure time (useful on Irix
+	for -n32 flag).
+
+	* lib/reLyX/configure.in: make sure that the prefix is set
+	correctly in LYX_DIR.
+
+1999-11-18  Andre' Poenitz <poenitz@mathematik.tu-chemnitz.de>
+
+	* src/commandtags.h: introduction of a new tag 'LFUN_SEQUENCE' to
+	be used by 'command-sequence' this allows to bind a key to a
+	sequence of LyX-commands
+	(Example: 'command-sequence math-insert alpha; math-insert beta;")
+
+	* src/LyXAction.C: add "command-sequence"
+
+	* src/LyXFunction.C: handling of "command-sequence"
+
+	* src/LyXFunction.[hC] changed LyXFunc::Dispatch(string const
+	 &cmd, string const &arg) to LyXFunc::Dispatch(string const& s)
+
+	* src/lyxserver.C, src/minibuffer.C: Use this new interface
+
 1999-11-17  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+	* src/buffer.C (writeFile): Do not output a comment givinf user
+	and date at the beginning of a .lyx file. This is useless and
+	annoys cvs anyway; update version number to 1.1.
+
 	* src/Makefile.am (LYX_DIR): add this definition, so that a
 	default path is hardcoded in LyX.
 
diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index 293151a790..b90fb676ff 100644
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -1,9 +1,13 @@
 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_PREFIX_PROGRAM(reLyX)
 AC_CONFIG_AUX_DIR(../../config)
 
+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}'
+
 dnl PACKAGE=reLyX
 dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
 PACKAGE=lyx
diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index 722214985e..4a89d9164f 100644
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = foreign
 MAINTAINERCLEANFILES = Makefile.in
 noinst_PROGRAMS = insets.o
 LIBS=
-LDFLAGS=
 ETAGS_ARGS = --c++
 INCLUDES = -I${srcdir}/../ 
 CXXLINK = $(LD) $(LDFLAGS)-r -o $(noinst_PROGRAMS)
diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index f6c1483f5f..e623732aa4 100644
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -2,7 +2,6 @@ AUTOMAKE_OPTIONS = foreign
 MAINTAINERCLEANFILES = Makefile.in
 noinst_PROGRAMS = mathed.o
 LIBS=
-LDFLAGS=
 ETAGS_ARGS = --c++
 INCLUDES = -I${top_srcdir}/images -I${srcdir}/../ 
 CXXLINK = $(LD) $(LDFLAGS) -r -o $(noinst_PROGRAMS)