foxygit / doom Log in
commit a98b31b018f5835889b3e6d2afe3d5f6789ea258
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Fri Nov 28 17:55:25 2014 -0500
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Fri Nov 28 17:55:25 2014 -0500

    Update library names to SDL2 versions.

    Use SDL2_mixer and SDL2_net rather than SDL_mixer/SDL_net.
---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index e6de4029..fdfff5d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ then
 fi

 dnl Search for SDL ...
+dnl SDL2-TODO: Use pkg-config?

 AM_PATH_SDL2(2.0.3)

@@ -58,18 +59,18 @@ AC_SDL_MAIN_WORKAROUND([
     # Check for SDL_mixer.

     AC_CHECK_LIB(SDL2_mixer,Mix_LoadMUS,[
-        SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer"
+        SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL2_mixer"
     ],[
-        echo "*** Could not find SDL_mixer.  Please install it."
+        echo "*** Could not find SDL2_mixer.  Please install it."
         exit -1
     ])

     # Check for SDL_net.

     AC_CHECK_LIB(SDL2_net,SDLNet_UDP_Send,[
-        SDLNET_LIBS="$SDLNET_LIBS -lSDL_net"
+        SDLNET_LIBS="$SDLNET_LIBS -lSDL2_net"
     ],[
-        echo "*** Could not find SDL_net.  Please install it."
+        echo "*** Could not find SDL2_net.  Please install it."
         exit -1
     ])