New configure-based build system. Still work in progress, but much im…

…proved

SDL.spec.in

@@ -1,6 +1,6 @@
 Summary: Simple DirectMedia Layer
-Name: @PACKAGE@
-Version: @VERSION@
+Name: SDL
+Version: @SDL_VERSION@
 Release: 1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 URL: http://www.libsdl.org/
@@ -45,7 +45,12 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 %ifos linux
-make install prefix=$RPM_BUILD_ROOT/%{prefix}
+make install prefix=$RPM_BUILD_ROOT/%{prefix} \
+             bindir=$RPM_BUILD_ROOT/%{_bindir} \
+             libdir=$RPM_BUILD_ROOT/%{_libdir} \
+             includedir=$RPM_BUILD_ROOT/%{_includedir} \
+             datadir=$RPM_BUILD_ROOT/%{_datadir} \
+             mandir=$RPM_BUILD_ROOT/%{_mandir}
 ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT/%{prefix}/lib/libSDL-1.1.so.0
 %else
 %makeinstall
@@ -81,8 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.%{__soext}
 %dir %{_includedir}/SDL
 %{_includedir}/SDL/*.h
-%{_mandir}/man3/*
 %{_datadir}/aclocal/*
+%{_mandir}/man3/*
 
 %changelog
 * Mon Jan 03 2004 Anders Bjorklund <afb@algonet.se>

TODO

@@ -1,4 +1,9 @@
 
+Update project files
+Create general SDL_config.h
+Create stubs for all the disabled subsystems
+Test all the platforms and drivers
+
 Wish list for the 1.3 development branch:
 
  * Use /etc/fb.modes, if available, like GGI does

acinclude.m4

@@ -1,24 +1,3 @@
-# Local macros for the SDL configure.in script
-
-dnl Function to link an architecture specific file
-dnl LINK_ARCH_SRC(source_dir, arch, source_file)
-AC_DEFUN([COPY_ARCH_SRC],
-[
-  old="$srcdir/$1/$2/$3"
-  new="$1/$3"
-  if test ! -d $1; then
-    echo "Creating directory $1"
-    mkdir -p $1
-  fi
-  echo "Copying $old -> $new"
-  cat >$new <<__EOF__
-/* WARNING:  This file was automatically generated!
- * Original: $old
- */
-__EOF__
-  cat >>$new <$old
-])
-
 ##############################################################################
 dnl Configure Paths for Alsa
 dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
@@ -1010,6 +989,12 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  beos*)
+    # On BeOS, this test takes a really really long time.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.

autogen.sh

@@ -1,19 +1,11 @@
 #!/bin/sh
 #
-echo "Generating build information using aclocal, automake and autoconf"
+echo "Generating build information using aclocal and autoconf"
 echo "This may take a while ..."
 
-# Touch the timestamps on all the files since CVS messes them up
-directory=`dirname $0`
-touch $directory/configure.in
-touch $directory/include/SDL_config.h.in
-
 # Regenerate configuration files
-aclocal || exit 1
-automake --foreign --include-deps --add-missing --copy || exit 1
-autoconf || exit 1
-(cd test; aclocal; automake --foreign --include-deps --add-missing --copy; autoconf)
+(aclocal && autoconf) || exit $?
+(cd test; aclocal; autoconf)
 
 # Run configure for this platform
-#./configure $*
 echo "Now you are ready to run ./configure"