[Wesnoth-cvs-commits] wesnoth configure.ac

[Jon Daniel]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jon Daniel <address@hidden>     05/03/09 10:26:45

Modified files:
        .              : configure.ac 

Log message:
        replaced hardocded SDL* libraray paths with `$SDL_CONFIG 
--prefix`/lib/libSDL*

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.121&tr2=1.122&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.121 wesnoth/configure.ac:1.122
--- wesnoth/configure.ac:1.121  Fri Mar  4 19:39:59 2005
+++ wesnoth/configure.ac        Wed Mar  9 10:26:45 2005
@@ -9,7 +9,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["server.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.121 $])
+AC_REVISION([$Revision: 1.122 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -400,8 +400,8 @@
 
 #
 
-if test -n "$LDPREFIX" -a -r /usr/lib/libSDL.la
-then SDL_LIBS=/usr/lib/libSDL.la
+if test -n "$LDPREFIX" -a -r `$SDL_CONFIG --prefix`/lib/libSDL.la
+then SDL_LIBS=`$SDL_CONFIG --prefix`/lib/libSDL.la
 else SDL_LIBS=`$SDL_CONFIG --libs`
 fi
 OLD_LIBS=$LIBS
@@ -411,11 +411,12 @@
 # it doesn't find it in FreeBSD
 # AC_CHECK_LIB([SDL], [SDL_Init])
 
+# FIXME disable all these checks in case of a cross-compile
 ac_link="$LDPREFIX $ac_link"
 AC_CHECK_LIB([SDL_image],
             [IMG_Load],
-            [if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_image.la
-then SDL_IMAGE_LIBS=/usr/lib/libSDL_image.la
+            [if test -n "$LDPREFIX" -a -r `$SDL_CONFIG 
--prefix`/lib/libSDL_image.la
+then SDL_IMAGE_LIBS=`$SDL_CONFIG --prefix`/lib/libSDL_image.la
 else SDL_IMAGE_LIBS=-lSDL_image
 fi],
             [AC_MSG_ERROR([*** SDL_image lib not found! Get SDL_image from
@@ -423,8 +424,8 @@
 
 AC_CHECK_LIB([SDL_mixer],
             [Mix_OpenAudio],
-            [if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_mixer.la
-then SDL_MIXER_LIBS=/usr/lib/libSDL_mixer.la
+            [if test -n "$LDPREFIX" -a -r `$SDL_CONFIG 
--prefix`/lib/libSDL_mixer.la
+then SDL_MIXER_LIBS=`$SDL_CONFIG --prefix`/lib/libSDL_mixer.la
 else SDL_MIXER_LIBS=-lSDL_mixer
 fi],
             [AC_MSG_ERROR([*** SDL_mixer lib not found! Get SDL_mixer from
@@ -432,8 +433,8 @@
             
 AC_CHECK_LIB([SDL_net],
             [SDLNet_Init],
-            [if test -n "$LDPREFIX" -a -r /usr/lib/libSDL_net.la
-then SDL_NET_LIBS=/usr/lib/libSDL_net.la
+            [if test -n "$LDPREFIX" -a -r `$SDL_CONFIG 
--prefix`/lib/libSDL_net.la
+then SDL_NET_LIBS=`$SDL_CONFIG --prefix`/lib/libSDL_net.la
 else SDL_NET_LIBS=-lSDL_net
 fi],
             [AC_MSG_ERROR([*** SDL_net lib not found! Get SDL_net from