[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth configure.ac
From: |
Jon Daniel |
Subject: |
[Wesnoth-cvs-commits] wesnoth configure.ac |
Date: |
Fri, 11 Mar 2005 18:25:19 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jon Daniel <address@hidden> 05/03/11 23:25:19
Modified files:
. : configure.ac
Log message:
Moved the host_os checks to a place where they get called even if
sdl_test is disabled.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.127&tr2=1.128&r1=text&r2=text
Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.127 wesnoth/configure.ac:1.128
--- wesnoth/configure.ac:1.127 Fri Mar 11 14:48:21 2005
+++ wesnoth/configure.ac Fri Mar 11 23:25:18 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.127 $])
+AC_REVISION([$Revision: 1.128 $])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -251,14 +251,6 @@
SDL_CFLAGS=`$SDL_CONFIG --cflags`
SDL_LIBS=`$SDL_CONFIG --libs`
-case ${host_os} in
- darwin*)
- SDL_LIBS="-framework Carbon $SDL_LIBS"
-esac
-case ${host_os} in
- mingw32*)
- SDL_LIBS="-lunicows $SDL_LIBS"
-esac
sdl_major_version=`$SDL_CONFIG --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sdl_minor_version=`$SDL_CONFIG --version | \
@@ -413,6 +405,14 @@
then SDL_LIBS=`$SDL_CONFIG --prefix`/lib/libSDL.la
else SDL_LIBS=`$SDL_CONFIG --libs`
fi
+case $host_os in
+ darwin*)
+ SDL_LIBS="-framework Carbon $SDL_LIBS"
+esac
+case $host_os in
+ mingw32*)
+ SDL_LIBS="-lunicows $SDL_LIBS"
+esac
OLD_LIBS=$LIBS
LIBS="$LIBS $SDL_LIBS"
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/09
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/09
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/09
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/10
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/11
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/11
- [Wesnoth-cvs-commits] wesnoth configure.ac,
Jon Daniel <=
- [Wesnoth-cvs-commits] wesnoth configure.ac, Jon Daniel, 2005/03/23