autogen aclocal fixups + build chroot dependency fixes
authorPat Mac <itgpmc@gmail.com>
Wed, 16 Jan 2013 08:43:36 +0000 (00:43 -0800)
committerPat Mac <itgpmc@gmail.com>
Wed, 16 Jan 2013 08:43:36 +0000 (00:43 -0800)
autogen.sh
chroot-arcade.sh

index 25fffbf..a640fe7 100755 (executable)
@@ -42,12 +42,15 @@ DIE=0
 if automake-1.9 --version > /dev/null 2>&1; then
         ACLOCAL=aclocal-1.9
         AUTOMAKE=automake-1.9
+        ACLOCAL_OPTIONS='-I autoconf/m4/'
 elif automake-1.8 --version > /dev/null 2>&1; then
         ACLOCAL=aclocal-1.8
         AUTOMAKE=automake-1.8
+        ACLOCAL_OPTIONS='-I autoconf/m4/'
 elif automake-1.7 --version > /dev/null 2>&1; then
         ACLOCAL=aclocal-1.7
         AUTOMAKE=automake-1.7
+        ACLOCAL_OPTIONS='-I autoconf/m4/'
 fi
 
 # If none of those were found, check if "automake" exists, and check the version.
index 6ab87cd..e30bfde 100755 (executable)
@@ -52,7 +52,7 @@ echo "Installing necessary dev packages..."
 echo "deb $DEBIAN_SARGE_MIRROR $SARGE_DIST_NAME main contrib non-free" >/etc/apt/sources.list
 echo "$DEBIAN_SARGE_BACKPORTS" >>/etc/apt/sources.list
 apt-get update
-apt-get install build-essential gettext automake1.8 gcc g++ libavcodec-dev libavformat-dev libxt-dev libogg-dev libpng-dev libjpeg-dev libvorbis-dev libusb-dev libglu1-mesa-dev libx11-dev libxrandr-dev liblua50-dev liblualib50-dev nvidia-glx-dev libmad0-dev libasound-dev git-core
+apt-get install build-essential gettext automake1.8 gcc g++ libavcodec-dev libavformat-dev libxt-dev libogg-dev libpng-dev libjpeg-dev libvorbis-dev libusb-dev libglu1-mesa-dev libx11-dev libxrandr-dev liblua50-dev liblualib50-dev nvidia-glx-dev libmad0-dev libasound2-dev git-core automake1.7 autoconf gettext
 echo "OpenITG AC chroot successfully set up!"
 exec /bin/bash
 !