Updated to SDL 2.0, and SDL 2.0 can now be installed coexisting with SDL 1.2

--HG--
rename : sdl-config.in => sdl2-config.in
rename : sdl.m4 => sdl2.m4
rename : sdl.pc.in => sdl2.pc.in

1 files changed, 13 insertions, 13 deletions

diff --git a/configure b/configure
index 9dfb3ccc..1a5d9cd4 100755
--- a/configure
+++ b/configure
@@ -2070,7 +2070,7 @@ orig_CFLAGS="$CFLAGS"
 
 #
 # Making releases:
-# Edit include/SDL/SDL_version.h and change the version, then:
+# Edit include/SDL_version.h and change the version, then:
 #   SDL_MICRO_VERSION += 1;
 #   SDL_INTERFACE_AGE += 1;
 #   SDL_BINARY_AGE += 1;
@@ -2078,8 +2078,8 @@ orig_CFLAGS="$CFLAGS"
 # if backwards compatibility has been broken,
 # set SDL_BINARY_AGE and SDL_INTERFACE_AGE to 0.
 #
-SDL_MAJOR_VERSION=1
-SDL_MINOR_VERSION=3
+SDL_MAJOR_VERSION=2
+SDL_MINOR_VERSION=0
 SDL_MICRO_VERSION=0
 SDL_INTERFACE_AGE=0
 SDL_BINARY_AGE=0
@@ -15552,7 +15552,7 @@ esac
 # built with it to be compiled for a particular architecture.
 #AX_GCC_ARCHFLAG([no], [BASE_CFLAGS="$BASE_CFLAGS $ax_cv_gcc_archflag]")
 BUILD_CFLAGS="$CFLAGS $CPPFLAGS -DUSING_GENERATED_CONFIG_H"
-# The default optimization for SDL 1.3 is -O3 (Bug #31)
+# The default optimization for SDL is -O3 (Bug #31)
 if test x$orig_CFLAGS = x; then
     BUILD_CFLAGS=`echo $BUILD_CFLAGS | sed 's/-O2/-O3/'`
 fi
@@ -15569,7 +15569,7 @@ EXTRA_LDFLAGS="$BASE_LDFLAGS"
 #    fi
 #done
 SDL_CFLAGS="$BASE_CFLAGS"
-SDL_LIBS="-lSDL $BASE_LDFLAGS"
+SDL_LIBS="-lSDL2 $BASE_LDFLAGS"
 CPPFLAGS="$CPPFLAGS $EXTRA_CFLAGS"
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
 LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
@@ -27471,7 +27471,7 @@ _ACEOF
         # The Windows platform requires special setup
         SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
         EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
-        EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS"
+        EXTRA_LDFLAGS="-lSDL2main $EXTRA_LDFLAGS"
         ;;
     *-*-cygwin* | *-*-mingw32*)
         ARCH=win32
@@ -27618,7 +27618,7 @@ _ACEOF
             have_loadso=yes
         fi
         # Set up the system libraries we need
-        # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME
+        # SDL is unicode, and unicows emulates this on Windows 98/ME
         # You can get this here: http://libunicows.sourceforge.net/
         #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
@@ -27626,7 +27626,7 @@ _ACEOF
         VERSION_SOURCES="$srcdir/src/main/windows/*.rc"
         SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c"
         SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
-        SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows"
+        SDL_LIBS="-lmingw32 -lSDL2main $SDL_LIBS -mwindows"
         ;;
     *-*-beos* | *-*-haiku*)
         ARCH=beos
@@ -27903,7 +27903,7 @@ fi
 case "$ARCH" in
   macosx)
     # Evil hack to allow static linking on Mac OS X
-    SDL_STATIC_LIBS="\${libdir}/libSDL.a $EXTRA_LDFLAGS"
+    SDL_STATIC_LIBS="\${libdir}/libSDL2.a $EXTRA_LDFLAGS"
     ;;
   *)
     SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
@@ -27956,7 +27956,7 @@ $VERSION_DEPENDS
 $SDLMAIN_DEPENDS
 __EOF__
 
-ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl-config SDL.spec sdl.pc"
+ac_config_files="$ac_config_files Makefile:Makefile.in:Makefile.rules sdl2-config SDL2.spec sdl2.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -28874,9 +28874,9 @@ do
     "include/SDL_config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/SDL_config.h" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:Makefile.in:Makefile.rules" ;;
-    "sdl-config") CONFIG_FILES="$CONFIG_FILES sdl-config" ;;
-    "SDL.spec") CONFIG_FILES="$CONFIG_FILES SDL.spec" ;;
-    "sdl.pc") CONFIG_FILES="$CONFIG_FILES sdl.pc" ;;
+    "sdl2-config") CONFIG_FILES="$CONFIG_FILES sdl2-config" ;;
+    "SDL2.spec") CONFIG_FILES="$CONFIG_FILES SDL2.spec" ;;
+    "sdl2.pc") CONFIG_FILES="$CONFIG_FILES sdl2.pc" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}