Merge pull request #1848 from jepler/remove-autocopied-files

Have autogen.sh copy in some files

Author: jepler

debian/control.top.in

@@ -11,6 +11,7 @@ Build-Depends:
     @MODUTILS_DEPENDS@,
     @EXTRA_BUILD@,
     autoconf,
+    automake,
     bwidget (>= 1.7),
     desktop-file-utils,
     gettext,

src/.gitignore

@@ -3,9 +3,12 @@
 /.tmp_versions
 /Makefile.inc
 /Makefile.modinc
+/config.guess
 /config.h
 /config.log
 /config.status
+/config.sub
+/install-sh
 /objects
 /depends
 /autom4te.cache

src/autogen.sh

@@ -3,8 +3,22 @@ rm -rf autom4te.cache
 AUTOGEN_TARGET=${AUTOGEN_TARGET-configure:config.h.in}
 set -e
 case :$AUTOGEN_TARGET: in
-*:configure:*) autoconf; touch configure ;;
+*:configure:*)
+    automake_libdir=`automake --print-libdir`
+    [ -e config.guess ] || cp $automake_libdir/config.guess .
+    [ -e config.sub ] || cp $automake_libdir/config.sub .
+    [ -e install-sh ] || cp $automake_libdir/install-sh .
+    autoconf
+    # autoconf only updates the timestamp if the output actually changed.
+    # The target's timestamp must be updated or make is confused
+    touch configure
+    ;;
 esac
 case :$AUTOGEN_TARGET: in
-*:config.h.in:*) autoheader; touch config.h.in ;;
+*:config.h.in:*)
+    autoheader
+    # autoheader only updates the timestamp if the output actually changed.
+    # The target's timestamp must be updated or make is confused
+    touch config.h.in
+    ;;
 esac