autogen.sh: remove --force-missing on automake

config/ltmain.sh: add patch for darwin

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10777 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index b1469c362880a6ad661e226026575f5c7ddf7579..e1b60a862d098b36c96300dcc9f1845b6bb33a75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-26    <larsbj@gullik.net>
+
+       * autogen.sh: remove the --force-missing option to automake 
+
 2006-01-25  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * NEWS: update for 1.4.0.

diff --git a/autogen.sh b/autogen.sh
index be24ca23f24ac843a1fcc8be171f6e0a1c838dc6..bda48fd4ab3a351200ecc81f70ec76b521065ef0 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
 
 ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
-AUTOMAKE="automake --add-missing --copy --force-missing --foreign"
+AUTOMAKE="automake --add-missing --copy --foreign"
 AUTOCONF="autoconf"
 ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 cygwin.m4 pkg.m4"
 

diff --git a/config/ChangeLog b/config/ChangeLog
index 41f0a3716138ff7b698da41f8c47f4fd06da7227..954da63a31624587df578cfe485a97527a9b9e89 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-26  Lars Gullik Bjønne  s<larsbj@lyx.org>
+
+       * ltmain.sh: apply patch for darwin
+
 2005-12-30  Lars Gullik Bjonnes  <larsbj@lyx.org>
 
        * ltmain.sh: update to newer version

diff --git a/config/ltmain.sh b/config/ltmain.sh
index 9be0eb1c38c2db306bd70075c0b78a49d842ebf4..8f3d0260daee43de7fa71a53ac27194fc39bce84 100644 (file)
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -1357,6 +1357,8 @@ EOF
          ;;
         darwin_framework)
          compiler_flags="$compiler_flags $arg"
+         compile_command="$compile_command $arg"
+         finalize_command="$finalize_command $arg"
          prev=
          continue
          ;;
@@ -1421,6 +1423,8 @@ EOF
       -framework)
         prev=darwin_framework
         compiler_flags="$compiler_flags $arg"
+        compile_command="$compile_command $arg"
+        finalize_command="$finalize_command $arg"
         continue
         ;;