build fixesvte_0_9_0

4 files changed, 8 insertions, 72 deletions

diff --git a/Makefile.am b/Makefile.am
index e305aaa3..53d7f990 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@ archive:
 	cvs -d $$root export -r $(CVSTAG) $$repo ; \
 	cd $$tmpdir/$$repo ; \
 	./autogen.sh ; \
-	make distcheck ; \
+	make all distcheck ; \
 	cp $(PACKAGE)-$(VERSION).tar.gz $$dir/ ; \
 	rm -fr $$tmpdir
 
diff --git a/autogen.sh b/autogen.sh
index 83e23ea4..97eb4c2f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -77,9 +77,16 @@ aclocal $ACLOCAL_FLAGS
 
 # optionally feature autoheader
 (autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
+automake -a -c $am_opt
+autoconf
 
+cd gnome-pty-helper
+touch config.h.in
+aclocal $ACLOCAL_FLAGS
+(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 automake -a -c $am_opt
 autoconf
+
 cd $ORIGDIR
 
 if test -z "$AUTOGEN_SUBDIR_MODE"; then
diff --git a/gnome-pty-helper/ChangeLog b/gnome-pty-helper/ChangeLog
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gnome-pty-helper/ChangeLog
diff --git a/gnome-pty-helper/autogen.sh b/gnome-pty-helper/autogen.sh
deleted file mode 100755
index c28ea23f..00000000
--- a/gnome-pty-helper/autogen.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-PROJECT=gnome-pty-helper
-TEST_TYPE=-f
-
-DIE=0
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have autoconf installed to compile $PROJECT."
-	echo "libtool the appropriate package for your distribution,"
-	echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-	DIE=1
-}
-
-have_automake=false
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake.*)' | sed 's/^[^0-9]*\(.*\)/\1/'`
-	case $automake_version in
-	   1.2*|1.3*|1.4*)
-		;;
-	   *)
-		have_automake=true
-		;;
-	esac
-fi
-if $have_automake ; then : ; else
-	echo
-	echo "You must have automake 1.5 installed to compile $PROJECT."
-	echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.5.tar.gz"
-	echo "(or a newer version if it is available)"
-	DIE=1
-fi
-
-if test "$DIE" -eq 1; then
-	exit 1
-fi
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        if test -z "$*"; then
-                echo "I am going to run ./configure with no arguments - if you wish "
-                echo "to pass any to it, please specify them on the $0 command line."
-        fi
-fi
-
-case $CC in
-*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-touch config.h.in
-aclocal $ACLOCAL_FLAGS
-
-# optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
-
-automake -a -c $am_opt
-autoconf
-cd $ORIGDIR
-
-if test -z "$AUTOGEN_SUBDIR_MODE"; then
-        $srcdir/configure --enable-maintainer-mode "$@"
-	chmod -Rf u+w $srcdir
-        echo 
-        echo "Now type 'make' to compile $PROJECT."
-fi