Removed automake dependency, to allow Universal binaries on Mac OS X

libsdl-org · Apr 30, 2006 · 71f8c28 · 71f8c28
1 parent 1b8f9a5
commit 71f8c28
Show file tree

Hide file tree

Showing 30 changed files with 1,162 additions and 934 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,7 @@
 1.2.7:
+Sam Lantinga - Sun Apr 30 09:01:44 PDT 2006
+ * Removed automake dependency, to allow Universal binaries on Mac OS X
+ * Added gcc-fat.sh for generating Universal binaries on Mac OS X
 Sam Lantinga - Sun Apr 30 01:48:40 PDT 2006
  * Updated libtool support to version 1.5.22
 Patrice Mandin - Sat Jul 16 16:43:24 UTC 2005

diff --git a/Makefile-EXE.wat b/Makefile-EXE.wat
diff --git a/Makefile.am b/Makefile.am
diff --git a/Makefile.wat b/Makefile.wat
diff --git a/SDLMIXER.lnk b/SDLMIXER.lnk
diff --git a/Watcom-EXE.mif b/Watcom-EXE.mif
diff --git a/Watcom-OS2.zip b/Watcom-OS2.zip
diff --git a/Watcom.mif b/Watcom.mif
diff --git a/autogen.sh b/autogen.sh
@@ -1,8 +1,18 @@
 #!/bin/sh
 #
-aclocal
-automake --foreign --include-deps --add-missing --copy
-autoconf
+echo "Generating build information using autoconf"
+echo "This may take a while ..."
 
-#./configure $*
+# Regenerate configuration files
+cp acinclude.m4 aclocal.m4
+found=false
+for autoconf in autoconf autoconf259
+do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
+done
+if test x$found = xfalse; then
+    echo "Couldn't find autoconf, aborting"
+    exit 1
+fi
+
+# Run configure for this platform
 echo "Now you are ready to run ./configure"