• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン516 (tree)
日時2012-02-09 23:38:02
作者logue

ログメッセージ

1.0.1リリース。
preferences.cppのtypoを修正。
configure.amを書きなおし。iconvが読み込まれるようにした。

変更サマリ

差分

--- marathon/trunk/m4/pkg.m4 (nonexistent)
+++ marathon/trunk/m4/pkg.m4 (revision 516)
@@ -0,0 +1,156 @@
1+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2+#
3+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
4+#
5+# This program is free software; you can redistribute it and/or modify
6+# it under the terms of the GNU General Public License as published by
7+# the Free Software Foundation; either version 2 of the License, or
8+# (at your option) any later version.
9+#
10+# This program is distributed in the hope that it will be useful, but
11+# WITHOUT ANY WARRANTY; without even the implied warranty of
12+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13+# General Public License for more details.
14+#
15+# You should have received a copy of the GNU General Public License
16+# along with this program; if not, write to the Free Software
17+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
18+#
19+# As a special exception to the GNU General Public License, if you
20+# distribute this file as part of a program that contains a
21+# configuration script generated by Autoconf, you may include it under
22+# the same distribution terms that you use for the rest of that program.
23+
24+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
25+# ----------------------------------
26+AC_DEFUN([PKG_PROG_PKG_CONFIG],
27+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
28+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
29+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
30+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
31+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
32+fi
33+if test -n "$PKG_CONFIG"; then
34+ _pkg_min_version=m4_default([$1], [0.9.0])
35+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
36+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
37+ AC_MSG_RESULT([yes])
38+ else
39+ AC_MSG_RESULT([no])
40+ PKG_CONFIG=""
41+ fi
42+
43+fi[]dnl
44+])# PKG_PROG_PKG_CONFIG
45+
46+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
47+#
48+# Check to see whether a particular set of modules exists. Similar
49+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
50+#
51+#
52+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
53+# this or PKG_CHECK_MODULES is called, or make sure to call
54+# PKG_CHECK_EXISTS manually
55+# --------------------------------------------------------------
56+AC_DEFUN([PKG_CHECK_EXISTS],
57+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
58+if test -n "$PKG_CONFIG" && \
59+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
60+ m4_ifval([$2], [$2], [:])
61+m4_ifvaln([$3], [else
62+ $3])dnl
63+fi])
64+
65+
66+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
67+# ---------------------------------------------
68+m4_define([_PKG_CONFIG],
69+[if test -n "$PKG_CONFIG"; then
70+ if test -n "$$1"; then
71+ pkg_cv_[]$1="$$1"
72+ else
73+ PKG_CHECK_EXISTS([$3],
74+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
75+ [pkg_failed=yes])
76+ fi
77+else
78+ pkg_failed=untried
79+fi[]dnl
80+])# _PKG_CONFIG
81+
82+# _PKG_SHORT_ERRORS_SUPPORTED
83+# -----------------------------
84+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
85+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
86+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
87+ _pkg_short_errors_supported=yes
88+else
89+ _pkg_short_errors_supported=no
90+fi[]dnl
91+])# _PKG_SHORT_ERRORS_SUPPORTED
92+
93+
94+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
95+# [ACTION-IF-NOT-FOUND])
96+#
97+#
98+# Note that if there is a possibility the first call to
99+# PKG_CHECK_MODULES might not happen, you should be sure to include an
100+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
101+#
102+#
103+# --------------------------------------------------------------
104+AC_DEFUN([PKG_CHECK_MODULES],
105+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
106+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
107+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
108+
109+pkg_failed=no
110+AC_MSG_CHECKING([for $1])
111+
112+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
113+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
114+
115+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
116+and $1[]_LIBS to avoid the need to call pkg-config.
117+See the pkg-config man page for more details.])
118+
119+if test $pkg_failed = yes; then
120+ _PKG_SHORT_ERRORS_SUPPORTED
121+ if test $_pkg_short_errors_supported = yes; then
122+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
123+ else
124+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
125+ fi
126+ # Put the nasty error message in config.log where it belongs
127+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
128+
129+ ifelse([$4], , [AC_MSG_ERROR(dnl
130+[Package requirements ($2) were not met:
131+
132+$$1_PKG_ERRORS
133+
134+Consider adjusting the PKG_CONFIG_PATH environment variable if you
135+installed software in a non-standard prefix.
136+
137+_PKG_TEXT
138+])],
139+ [$4])
140+elif test $pkg_failed = untried; then
141+ ifelse([$4], , [AC_MSG_FAILURE(dnl
142+[The pkg-config script could not be found or is too old. Make sure it
143+is in your PATH or set the PKG_CONFIG environment variable to the full
144+path to pkg-config.
145+
146+_PKG_TEXT
147+
148+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
149+ [$4])
150+else
151+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
152+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
153+ AC_MSG_RESULT([yes])
154+ ifelse([$3], , :, [$3])
155+fi[]dnl
156+])# PKG_CHECK_MODULES
--- marathon/trunk/m4/sdl.m4 (nonexistent)
+++ marathon/trunk/m4/sdl.m4 (revision 516)
@@ -0,0 +1,185 @@
1+# Configure paths for SDL
2+# Sam Lantinga 9/21/99
3+# stolen from Manish Singh
4+# stolen back from Frank Belew
5+# stolen from Manish Singh
6+# Shamelessly stolen from Owen Taylor
7+
8+# serial 1
9+
10+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
11+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
12+dnl
13+AC_DEFUN([AM_PATH_SDL],
14+[dnl
15+dnl Get the cflags and libraries from the sdl-config script
16+dnl
17+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
18+ sdl_prefix="$withval", sdl_prefix="")
19+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
20+ sdl_exec_prefix="$withval", sdl_exec_prefix="")
21+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
22+ , enable_sdltest=yes)
23+
24+ if test x$sdl_exec_prefix != x ; then
25+ sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
26+ if test x${SDL_CONFIG+set} != xset ; then
27+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
28+ fi
29+ fi
30+ if test x$sdl_prefix != x ; then
31+ sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
32+ if test x${SDL_CONFIG+set} != xset ; then
33+ SDL_CONFIG=$sdl_prefix/bin/sdl-config
34+ fi
35+ fi
36+
37+ as_save_PATH="$PATH"
38+ if test "x$prefix" != xNONE; then
39+ PATH="$prefix/bin:$prefix/usr/bin:$PATH"
40+ fi
41+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
42+ PATH="$as_save_PATH"
43+ min_sdl_version=ifelse([$1], ,0.11.0,$1)
44+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
45+ no_sdl=""
46+ if test "$SDL_CONFIG" = "no" ; then
47+ no_sdl=yes
48+ else
49+ SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
50+ SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
51+
52+ sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
53+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
54+ sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
55+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
56+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
57+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
58+ if test "x$enable_sdltest" = "xyes" ; then
59+ ac_save_CFLAGS="$CFLAGS"
60+ ac_save_CXXFLAGS="$CXXFLAGS"
61+ ac_save_LIBS="$LIBS"
62+ CFLAGS="$CFLAGS $SDL_CFLAGS"
63+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
64+ LIBS="$LIBS $SDL_LIBS"
65+dnl
66+dnl Now check if the installed SDL is sufficiently new. (Also sanity
67+dnl checks the results of sdl-config to some extent
68+dnl
69+ rm -f conf.sdltest
70+ AC_TRY_RUN([
71+#include <stdio.h>
72+#include <stdlib.h>
73+#include <string.h>
74+#include "SDL.h"
75+
76+char*
77+my_strdup (char *str)
78+{
79+ char *new_str;
80+
81+ if (str)
82+ {
83+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
84+ strcpy (new_str, str);
85+ }
86+ else
87+ new_str = NULL;
88+
89+ return new_str;
90+}
91+
92+int main (int argc, char *argv[])
93+{
94+ int major, minor, micro;
95+ char *tmp_version;
96+
97+ /* This hangs on some systems (?)
98+ system ("touch conf.sdltest");
99+ */
100+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
101+
102+ /* HP/UX 9 (%@#!) writes to sscanf strings */
103+ tmp_version = my_strdup("$min_sdl_version");
104+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
105+ printf("%s, bad version string\n", "$min_sdl_version");
106+ exit(1);
107+ }
108+
109+ if (($sdl_major_version > major) ||
110+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
111+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
112+ {
113+ return 0;
114+ }
115+ else
116+ {
117+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
118+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
119+ printf("*** best to upgrade to the required version.\n");
120+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
121+ printf("*** to point to the correct copy of sdl-config, and remove the file\n");
122+ printf("*** config.cache before re-running configure\n");
123+ return 1;
124+ }
125+}
126+
127+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
128+ CFLAGS="$ac_save_CFLAGS"
129+ CXXFLAGS="$ac_save_CXXFLAGS"
130+ LIBS="$ac_save_LIBS"
131+ fi
132+ fi
133+ if test "x$no_sdl" = x ; then
134+ AC_MSG_RESULT(yes)
135+ ifelse([$2], , :, [$2])
136+ else
137+ AC_MSG_RESULT(no)
138+ if test "$SDL_CONFIG" = "no" ; then
139+ echo "*** The sdl-config script installed by SDL could not be found"
140+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
141+ echo "*** your path, or set the SDL_CONFIG environment variable to the"
142+ echo "*** full path to sdl-config."
143+ else
144+ if test -f conf.sdltest ; then
145+ :
146+ else
147+ echo "*** Could not run SDL test program, checking why..."
148+ CFLAGS="$CFLAGS $SDL_CFLAGS"
149+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
150+ LIBS="$LIBS $SDL_LIBS"
151+ AC_TRY_LINK([
152+#include <stdio.h>
153+#include "SDL.h"
154+
155+int main(int argc, char *argv[])
156+{ return 0; }
157+#undef main
158+#define main K_and_R_C_main
159+], [ return 0; ],
160+ [ echo "*** The test program compiled, but did not run. This usually means"
161+ echo "*** that the run-time linker is not finding SDL or finding the wrong"
162+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
163+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
164+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
165+ echo "*** is required on your system"
166+ echo "***"
167+ echo "*** If you have an old version installed, it is best to remove it, although"
168+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
169+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
170+ echo "*** exact error that occured. This usually means SDL was incorrectly installed"
171+ echo "*** or that you have moved SDL since it was installed. In the latter case, you"
172+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
173+ CFLAGS="$ac_save_CFLAGS"
174+ CXXFLAGS="$ac_save_CXXFLAGS"
175+ LIBS="$ac_save_LIBS"
176+ fi
177+ fi
178+ SDL_CFLAGS=""
179+ SDL_LIBS=""
180+ ifelse([$3], , :, [$3])
181+ fi
182+ AC_SUBST(SDL_CFLAGS)
183+ AC_SUBST(SDL_LIBS)
184+ rm -f conf.sdltest
185+])
--- marathon/trunk/configure (revision 515)
+++ marathon/trunk/configure (revision 516)
@@ -1,8 +1,8 @@
11 #! /bin/sh
22 # Guess values for system-dependent variables and create Makefiles.
3-# Generated by GNU Autoconf 2.68 for Aleph One/SDL 20111202.
3+# Generated by GNU Autoconf 2.68 for Aleph One JP/SDL 20120210.
44 #
5-# Report bugs to <http://sourceforge.net/bugs/?group_id=1997>.
5+# Report bugs to <http://forum.logue.be/index.php?board=8.0>.
66 #
77 #
88 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -239,7 +239,7 @@
239239 $as_echo "$0: be upgraded to zsh 4.3.4 or later."
240240 else
241241 $as_echo "$0: Please tell bug-autoconf@gnu.org and
242-$0: http://sourceforge.net/bugs/?group_id=1997 about your
242+$0: http://forum.logue.be/index.php?board=8.0 about your
243243 $0: system, including any error possibly output before this
244244 $0: message. Then install a modern shell, or manually run
245245 $0: the script under such a shell if you do have one."
@@ -560,10 +560,10 @@
560560 # Identity of this package.
561561 PACKAGE_NAME='Aleph One JP/SDL'
562562 PACKAGE_TARNAME='AlephOneJP'
563-PACKAGE_VERSION='20111202'
564-PACKAGE_STRING='Aleph One JP/SDL 20111202'
565-PACKAGE_BUGREPORT='http://sourceforge.net/bugs/?group_id=1997'
566-PACKAGE_URL=''
563+PACKAGE_VERSION='20120210'
564+PACKAGE_STRING='Aleph One JP/SDL 20120210'
565+PACKAGE_BUGREPORT='http://forum.logue.be/index.php?board=8.0'
566+PACKAGE_URL='http://sourceforge.jp/projects/marathon/ '
567567
568568 ac_unique_file="Source_Files/shell.cpp"
569569 # Factoring default headers for most tests.
@@ -620,8 +620,6 @@
620620 BUILD_ZZIP_RWOPS_TRUE
621621 ZZIP_LIBS
622622 ZZIP_CFLAGS
623-PKG_CONFIG_LIBDIR
624-PKG_CONFIG_PATH
625623 PKG_CONFIG
626624 HAVE_SDL_NET_FALSE
627625 HAVE_SDL_NET_TRUE
@@ -757,17 +755,11 @@
757755 LIBS
758756 CPPFLAGS
759757 CPP
760-CPPFLAGS
761758 CXX
762759 CXXFLAGS
763-LDFLAGS
764-LIBS
765-CPPFLAGS
766760 CCC
767761 CXXCPP
768762 PKG_CONFIG
769-PKG_CONFIG_PATH
770-PKG_CONFIG_LIBDIR
771763 ZZIP_CFLAGS
772764 ZZIP_LIBS
773765 PNG_CFLAGS
@@ -1316,7 +1308,7 @@
13161308 # Omit some internal or obsolete options to make the list less imposing.
13171309 # This message is too long to be a string in the A/UX 3.1 sh.
13181310 cat <<_ACEOF
1319-\`configure' configures Aleph One/SDL 20111202 to adapt to many kinds of systems.
1311+\`configure' configures Aleph One JP/SDL 20120210 to adapt to many kinds of systems.
13201312
13211313 Usage: $0 [OPTION]... [VAR=VALUE]...
13221314
@@ -1364,7 +1356,7 @@
13641356 --infodir=DIR info documentation [DATAROOTDIR/info]
13651357 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
13661358 --mandir=DIR man documentation [DATAROOTDIR/man]
1367- --docdir=DIR documentation root [DATAROOTDIR/doc/AlephOne]
1359+ --docdir=DIR documentation root [DATAROOTDIR/doc/AlephOneJP]
13681360 --htmldir=DIR html documentation [DOCDIR]
13691361 --dvidir=DIR dvi documentation [DOCDIR]
13701362 --pdfdir=DIR pdf documentation [DOCDIR]
@@ -1387,7 +1379,7 @@
13871379
13881380 if test -n "$ac_init_help"; then
13891381 case $ac_init_help in
1390- short | recursive ) echo "Configuration of Aleph One/SDL 20111202:";;
1382+ short | recursive ) echo "Configuration of Aleph One JP/SDL 20120210:";;
13911383 esac
13921384 cat <<\_ACEOF
13931385
@@ -1429,10 +1421,6 @@
14291421 CXXFLAGS C++ compiler flags
14301422 CXXCPP C++ preprocessor
14311423 PKG_CONFIG path to pkg-config utility
1432- PKG_CONFIG_PATH
1433- directories to add to pkg-config's search path
1434- PKG_CONFIG_LIBDIR
1435- path overriding pkg-config's built-in search path
14361424 ZZIP_CFLAGS C compiler flags for ZZIP, overriding pkg-config
14371425 ZZIP_LIBS linker flags for ZZIP, overriding pkg-config
14381426 PNG_CFLAGS C compiler flags for PNG, overriding pkg-config
@@ -1445,7 +1433,8 @@
14451433 Use these variables to override the choices made by `configure' or to help
14461434 it to find libraries and programs with nonstandard names/locations.
14471435
1448-Report bugs to <http://sourceforge.net/bugs/?group_id=1997>.
1436+Report bugs to <http://forum.logue.be/index.php?board=8.0>.
1437+Aleph One JP/SDL home page: <http://sourceforge.jp/projects/marathon/ >.
14491438 _ACEOF
14501439 ac_status=$?
14511440 fi
@@ -1508,7 +1497,7 @@
15081497 test -n "$ac_init_help" && exit $ac_status
15091498 if $ac_init_version; then
15101499 cat <<\_ACEOF
1511-Aleph One/SDL configure 20111202
1500+Aleph One JP/SDL configure 20120210
15121501 generated by GNU Autoconf 2.68
15131502
15141503 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1742,9 +1731,9 @@
17421731 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
17431732 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
17441733 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1745-( $as_echo "## --------------------------------------------------------- ##
1746-## Report this to http://sourceforge.net/bugs/?group_id=1997 ##
1747-## --------------------------------------------------------- ##"
1734+( $as_echo "## -------------------------------------------------------- ##
1735+## Report this to http://forum.logue.be/index.php?board=8.0 ##
1736+## -------------------------------------------------------- ##"
17481737 ) | sed "s/^/$as_me: WARNING: /" >&2
17491738 ;;
17501739 esac
@@ -2019,9 +2008,9 @@
20192008 $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
20202009 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
20212010 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
2022-( $as_echo "## --------------------------------------------------------- ##
2023-## Report this to http://sourceforge.net/bugs/?group_id=1997 ##
2024-## --------------------------------------------------------- ##"
2011+( $as_echo "## -------------------------------------------------------- ##
2012+## Report this to http://forum.logue.be/index.php?board=8.0 ##
2013+## -------------------------------------------------------- ##"
20252014 ) | sed "s/^/$as_me: WARNING: /" >&2
20262015 ;;
20272016 esac
@@ -2043,7 +2032,7 @@
20432032 This file contains any messages produced by compilers while
20442033 running configure, to aid debugging if configure makes a mistake.
20452034
2046-It was created by Aleph One/SDL $as_me 20111202, which was
2035+It was created by Aleph One JP/SDL $as_me 20120210, which was
20472036 generated by GNU Autoconf 2.68. Invocation command line was
20482037
20492038 $ $0 $@
@@ -2302,7 +2291,7 @@
23022291 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
23032292 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
23042293 as_fn_error $? "failed to load site script $ac_site_file
2305-See \`config.log' for more details" "$LINENO" 5; }
2294+See \`config.log' for more details" "$LINENO" 5 ; }
23062295 fi
23072296 done
23082297
@@ -2445,7 +2434,7 @@
24452434 $as_echo "$ac_cv_build" >&6; }
24462435 case $ac_cv_build in
24472436 *-*-*) ;;
2448-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
2437+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
24492438 esac
24502439 build=$ac_cv_build
24512440 ac_save_IFS=$IFS; IFS='-'
@@ -2478,7 +2467,7 @@
24782467 $as_echo "$ac_cv_host" >&6; }
24792468 case $ac_cv_host in
24802469 *-*-*) ;;
2481-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
2470+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
24822471 esac
24832472 host=$ac_cv_host
24842473 ac_save_IFS=$IFS; IFS='-'
@@ -2511,7 +2500,7 @@
25112500 $as_echo "$ac_cv_target" >&6; }
25122501 case $ac_cv_target in
25132502 *-*-*) ;;
2514-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
2503+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;
25152504 esac
25162505 target=$ac_cv_target
25172506 ac_save_IFS=$IFS; IFS='-'
@@ -2534,6 +2523,79 @@
25342523 NONENONEs,x,x, &&
25352524 program_prefix=${target_alias}-
25362525
2526+# Configure paths for SDL
2527+# Sam Lantinga 9/21/99
2528+# stolen from Manish Singh
2529+# stolen back from Frank Belew
2530+# stolen from Manish Singh
2531+# Shamelessly stolen from Owen Taylor
2532+
2533+# serial 1
2534+
2535+
2536+
2537+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2538+#
2539+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
2540+#
2541+# This program is free software; you can redistribute it and/or modify
2542+# it under the terms of the GNU General Public License as published by
2543+# the Free Software Foundation; either version 2 of the License, or
2544+# (at your option) any later version.
2545+#
2546+# This program is distributed in the hope that it will be useful, but
2547+# WITHOUT ANY WARRANTY; without even the implied warranty of
2548+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2549+# General Public License for more details.
2550+#
2551+# You should have received a copy of the GNU General Public License
2552+# along with this program; if not, write to the Free Software
2553+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2554+#
2555+# As a special exception to the GNU General Public License, if you
2556+# distribute this file as part of a program that contains a
2557+# configuration script generated by Autoconf, you may include it under
2558+# the same distribution terms that you use for the rest of that program.
2559+
2560+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
2561+# ----------------------------------
2562+# PKG_PROG_PKG_CONFIG
2563+
2564+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
2565+#
2566+# Check to see whether a particular set of modules exists. Similar
2567+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
2568+#
2569+#
2570+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
2571+# this or PKG_CHECK_MODULES is called, or make sure to call
2572+# PKG_CHECK_EXISTS manually
2573+# --------------------------------------------------------------
2574+
2575+
2576+
2577+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
2578+# ---------------------------------------------
2579+# _PKG_CONFIG
2580+
2581+# _PKG_SHORT_ERRORS_SUPPORTED
2582+# -----------------------------
2583+# _PKG_SHORT_ERRORS_SUPPORTED
2584+
2585+
2586+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
2587+# [ACTION-IF-NOT-FOUND])
2588+#
2589+#
2590+# Note that if there is a possibility the first call to
2591+# PKG_CHECK_MODULES might not happen, you should be sure to include an
2592+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
2593+#
2594+#
2595+# --------------------------------------------------------------
2596+# PKG_CHECK_MODULES
2597+
2598+
25372599 am__api_version='1.11'
25382600
25392601 # Find a good install program. We prefer a C program (faster),
@@ -2640,11 +2702,11 @@
26402702 '
26412703 case `pwd` in
26422704 *[\\\"\#\$\&\'\`$am_lf]*)
2643- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
2705+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
26442706 esac
26452707 case $srcdir in
26462708 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2647- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2709+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
26482710 esac
26492711
26502712 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2971,8 +3033,8 @@
29713033
29723034
29733035 # Define the identity of the package.
2974- PACKAGE='AlephOne_JP'
2975- VERSION='20111202'
3036+ PACKAGE='AlephOneJP'
3037+ VERSION='20120210'
29763038
29773039
29783040 cat >>confdefs.h <<_ACEOF
@@ -3394,7 +3456,7 @@
33943456 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
33953457 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
33963458 as_fn_error $? "no acceptable C compiler found in \$PATH
3397-See \`config.log' for more details" "$LINENO" 5; }
3459+See \`config.log' for more details" "$LINENO" 5 ; }
33983460
33993461 # Provide some information about the compiler.
34003462 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -3509,7 +3571,7 @@
35093571 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
35103572 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
35113573 as_fn_error 77 "C compiler cannot create executables
3512-See \`config.log' for more details" "$LINENO" 5; }
3574+See \`config.log' for more details" "$LINENO" 5 ; }
35133575 else
35143576 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
35153577 $as_echo "yes" >&6; }
@@ -3552,7 +3614,7 @@
35523614 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
35533615 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
35543616 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
3555-See \`config.log' for more details" "$LINENO" 5; }
3617+See \`config.log' for more details" "$LINENO" 5 ; }
35563618 fi
35573619 rm -f conftest conftest$ac_cv_exeext
35583620 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3611,7 +3673,7 @@
36113673 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
36123674 as_fn_error $? "cannot run C compiled programs.
36133675 If you meant to cross compile, use \`--host'.
3614-See \`config.log' for more details" "$LINENO" 5; }
3676+See \`config.log' for more details" "$LINENO" 5 ; }
36153677 fi
36163678 fi
36173679 fi
@@ -3663,7 +3725,7 @@
36633725 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
36643726 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
36653727 as_fn_error $? "cannot compute suffix of object files: cannot compile
3666-See \`config.log' for more details" "$LINENO" 5; }
3728+See \`config.log' for more details" "$LINENO" 5 ; }
36673729 fi
36683730 rm -f conftest.$ac_cv_objext conftest.$ac_ext
36693731 fi
@@ -4200,7 +4262,7 @@
42004262 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
42014263 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
42024264 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
4203-See \`config.log' for more details" "$LINENO" 5; }
4265+See \`config.log' for more details" "$LINENO" 5 ; }
42044266 fi
42054267
42064268 ac_ext=c
@@ -4717,7 +4779,7 @@
47174779 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
47184780 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
47194781 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
4720-See \`config.log' for more details" "$LINENO" 5; }
4782+See \`config.log' for more details" "$LINENO" 5 ; }
47214783 fi
47224784
47234785 ac_ext=c
@@ -5237,7 +5299,95 @@
52375299 fi
52385300
52395301
5302+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5
5303+$as_echo_n "checking for libiconv in -liconv... " >&6; }
5304+if ${ac_cv_lib_iconv_libiconv+:} false; then :
5305+ $as_echo_n "(cached) " >&6
5306+else
5307+ ac_check_lib_save_LIBS=$LIBS
5308+LIBS="-liconv $LIBS"
5309+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5310+/* end confdefs.h. */
52405311
5312+/* Override any GCC internal prototype to avoid an error.
5313+ Use char because int might match the return type of a GCC
5314+ builtin and then its argument prototype would still apply. */
5315+#ifdef __cplusplus
5316+extern "C"
5317+#endif
5318+char libiconv ();
5319+int
5320+main ()
5321+{
5322+return libiconv ();
5323+ ;
5324+ return 0;
5325+}
5326+_ACEOF
5327+if ac_fn_c_try_link "$LINENO"; then :
5328+ ac_cv_lib_iconv_libiconv=yes
5329+else
5330+ ac_cv_lib_iconv_libiconv=no
5331+fi
5332+rm -f core conftest.err conftest.$ac_objext \
5333+ conftest$ac_exeext conftest.$ac_ext
5334+LIBS=$ac_check_lib_save_LIBS
5335+fi
5336+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv" >&5
5337+$as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
5338+if test "x$ac_cv_lib_iconv_libiconv" = xyes; then :
5339+ cat >>confdefs.h <<_ACEOF
5340+#define HAVE_LIBICONV 1
5341+_ACEOF
5342+
5343+ LIBS="-liconv $LIBS"
5344+
5345+fi
5346+
5347+if test $ac_cv_lib_iconv_libiconv = no; then
5348+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
5349+$as_echo_n "checking for iconv in -liconv... " >&6; }
5350+if ${ac_cv_lib_iconv_iconv_+:} false; then :
5351+ $as_echo_n "(cached) " >&6
5352+else
5353+ ac_check_lib_save_LIBS=$LIBS
5354+LIBS="-liconv $LIBS"
5355+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5356+/* end confdefs.h. */
5357+
5358+/* Override any GCC internal prototype to avoid an error.
5359+ Use char because int might match the return type of a GCC
5360+ builtin and then its argument prototype would still apply. */
5361+#ifdef __cplusplus
5362+extern "C"
5363+#endif
5364+char iconv ();
5365+int
5366+main ()
5367+{
5368+return iconv ();
5369+ ;
5370+ return 0;
5371+}
5372+_ACEOF
5373+if ac_fn_c_try_link "$LINENO"; then :
5374+ ac_cv_lib_iconv_iconv_=yes
5375+else
5376+ ac_cv_lib_iconv_iconv_=no
5377+fi
5378+rm -f core conftest.err conftest.$ac_objext \
5379+ conftest$ac_exeext conftest.$ac_ext
5380+LIBS=$ac_check_lib_save_LIBS
5381+fi
5382+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_" >&5
5383+$as_echo "$ac_cv_lib_iconv_iconv_" >&6; }
5384+if test "x$ac_cv_lib_iconv_iconv_" = xyes; then :
5385+ as_fn_error $? "You need iconv to run Aleph One JP." "$LINENO" 5
5386+fi
5387+
5388+fi
5389+
5390+
52415391 # Check whether --with-sdl-prefix was given.
52425392 if test "${with_sdl_prefix+set}" = set; then :
52435393 withval=$with_sdl_prefix; sdl_prefix="$withval"
@@ -5895,11 +6045,6 @@
58956045 if [ "x$enable_zzip" = "xyes" ]; then
58966046
58976047
5898-
5899-
5900-
5901-
5902-
59036048 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
59046049 if test -n "$ac_tool_prefix"; then
59056050 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -6012,6 +6157,7 @@
60126157 $as_echo "no" >&6; }
60136158 PKG_CONFIG=""
60146159 fi
6160+
60156161 fi
60166162
60176163 pkg_failed=no
@@ -6018,10 +6164,11 @@
60186164 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5
60196165 $as_echo_n "checking for ZZIP... " >&6; }
60206166
6021-if test -n "$ZZIP_CFLAGS"; then
6022- pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS"
6023- elif test -n "$PKG_CONFIG"; then
6024- if test -n "$PKG_CONFIG" && \
6167+if test -n "$PKG_CONFIG"; then
6168+ if test -n "$ZZIP_CFLAGS"; then
6169+ pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS"
6170+ else
6171+ if test -n "$PKG_CONFIG" && \
60256172 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
60266173 ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
60276174 ac_status=$?
@@ -6028,17 +6175,18 @@
60286175 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
60296176 test $ac_status = 0; }; then
60306177 pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null`
6031- test "x$?" != "x0" && pkg_failed=yes
60326178 else
60336179 pkg_failed=yes
60346180 fi
6035- else
6036- pkg_failed=untried
6181+ fi
6182+else
6183+ pkg_failed=untried
60376184 fi
6038-if test -n "$ZZIP_LIBS"; then
6039- pkg_cv_ZZIP_LIBS="$ZZIP_LIBS"
6040- elif test -n "$PKG_CONFIG"; then
6041- if test -n "$PKG_CONFIG" && \
6185+if test -n "$PKG_CONFIG"; then
6186+ if test -n "$ZZIP_LIBS"; then
6187+ pkg_cv_ZZIP_LIBS="$ZZIP_LIBS"
6188+ else
6189+ if test -n "$PKG_CONFIG" && \
60426190 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
60436191 ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
60446192 ac_status=$?
@@ -6045,19 +6193,17 @@
60456193 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
60466194 test $ac_status = 0; }; then
60476195 pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null`
6048- test "x$?" != "x0" && pkg_failed=yes
60496196 else
60506197 pkg_failed=yes
60516198 fi
6052- else
6053- pkg_failed=untried
6199+ fi
6200+else
6201+ pkg_failed=untried
60546202 fi
60556203
60566204
60576205
60586206 if test $pkg_failed = yes; then
6059- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6060-$as_echo "no" >&6; }
60616207
60626208 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
60636209 _pkg_short_errors_supported=yes
@@ -6065,9 +6211,9 @@
60656211 _pkg_short_errors_supported=no
60666212 fi
60676213 if test $_pkg_short_errors_supported = yes; then
6068- ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "zziplib >= 0.10.75" 2>&1`
6214+ ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
60696215 else
6070- ZZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "zziplib >= 0.10.75" 2>&1`
6216+ ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
60716217 fi
60726218 # Put the nasty error message in config.log where it belongs
60736219 echo "$ZZIP_PKG_ERRORS" >&5
@@ -6081,10 +6227,9 @@
60816227
60826228 Alternatively, you may set the environment variables ZZIP_CFLAGS
60836229 and ZZIP_LIBS to avoid the need to call pkg-config.
6084-See the pkg-config man page for more details." "$LINENO" 5
6230+See the pkg-config man page for more details.
6231+" "$LINENO" 5
60856232 elif test $pkg_failed = untried; then
6086- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6087-$as_echo "no" >&6; }
60886233 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
60896234 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
60906235 as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
@@ -6095,8 +6240,8 @@
60956240 and ZZIP_LIBS to avoid the need to call pkg-config.
60966241 See the pkg-config man page for more details.
60976242
6098-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
6099-See \`config.log' for more details" "$LINENO" 5; }
6243+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
6244+See \`config.log' for more details" "$LINENO" 5 ; }
61006245 else
61016246 ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS
61026247 ZZIP_LIBS=$pkg_cv_ZZIP_LIBS
@@ -6128,10 +6273,11 @@
61286273 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PNG" >&5
61296274 $as_echo_n "checking for PNG... " >&6; }
61306275
6131-if test -n "$PNG_CFLAGS"; then
6132- pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
6133- elif test -n "$PKG_CONFIG"; then
6134- if test -n "$PKG_CONFIG" && \
6276+if test -n "$PKG_CONFIG"; then
6277+ if test -n "$PNG_CFLAGS"; then
6278+ pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
6279+ else
6280+ if test -n "$PKG_CONFIG" && \
61356281 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
61366282 ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
61376283 ac_status=$?
@@ -6138,17 +6284,18 @@
61386284 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
61396285 test $ac_status = 0; }; then
61406286 pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
6141- test "x$?" != "x0" && pkg_failed=yes
61426287 else
61436288 pkg_failed=yes
61446289 fi
6145- else
6146- pkg_failed=untried
6290+ fi
6291+else
6292+ pkg_failed=untried
61476293 fi
6148-if test -n "$PNG_LIBS"; then
6149- pkg_cv_PNG_LIBS="$PNG_LIBS"
6150- elif test -n "$PKG_CONFIG"; then
6151- if test -n "$PKG_CONFIG" && \
6294+if test -n "$PKG_CONFIG"; then
6295+ if test -n "$PNG_LIBS"; then
6296+ pkg_cv_PNG_LIBS="$PNG_LIBS"
6297+ else
6298+ if test -n "$PKG_CONFIG" && \
61526299 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
61536300 ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
61546301 ac_status=$?
@@ -6155,19 +6302,17 @@
61556302 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
61566303 test $ac_status = 0; }; then
61576304 pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
6158- test "x$?" != "x0" && pkg_failed=yes
61596305 else
61606306 pkg_failed=yes
61616307 fi
6162- else
6163- pkg_failed=untried
6308+ fi
6309+else
6310+ pkg_failed=untried
61646311 fi
61656312
61666313
61676314
61686315 if test $pkg_failed = yes; then
6169- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6170-$as_echo "no" >&6; }
61716316
61726317 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
61736318 _pkg_short_errors_supported=yes
@@ -6175,9 +6320,9 @@
61756320 _pkg_short_errors_supported=no
61766321 fi
61776322 if test $_pkg_short_errors_supported = yes; then
6178- PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpng" 2>&1`
6323+ PNG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpng"`
61796324 else
6180- PNG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpng" 2>&1`
6325+ PNG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpng"`
61816326 fi
61826327 # Put the nasty error message in config.log where it belongs
61836328 echo "$PNG_PKG_ERRORS" >&5
@@ -6191,10 +6336,9 @@
61916336
61926337 Alternatively, you may set the environment variables PNG_CFLAGS
61936338 and PNG_LIBS to avoid the need to call pkg-config.
6194-See the pkg-config man page for more details." "$LINENO" 5
6339+See the pkg-config man page for more details.
6340+" "$LINENO" 5
61956341 elif test $pkg_failed = untried; then
6196- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6197-$as_echo "no" >&6; }
61986342 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
61996343 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
62006344 as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
@@ -6205,8 +6349,8 @@
62056349 and PNG_LIBS to avoid the need to call pkg-config.
62066350 See the pkg-config man page for more details.
62076351
6208-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
6209-See \`config.log' for more details" "$LINENO" 5; }
6352+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
6353+See \`config.log' for more details" "$LINENO" 5 ; }
62106354 else
62116355 PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
62126356 PNG_LIBS=$pkg_cv_PNG_LIBS
@@ -6464,10 +6608,11 @@
64646608 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBISFILE" >&5
64656609 $as_echo_n "checking for VORBISFILE... " >&6; }
64666610
6467-if test -n "$VORBISFILE_CFLAGS"; then
6468- pkg_cv_VORBISFILE_CFLAGS="$VORBISFILE_CFLAGS"
6469- elif test -n "$PKG_CONFIG"; then
6470- if test -n "$PKG_CONFIG" && \
6611+if test -n "$PKG_CONFIG"; then
6612+ if test -n "$VORBISFILE_CFLAGS"; then
6613+ pkg_cv_VORBISFILE_CFLAGS="$VORBISFILE_CFLAGS"
6614+ else
6615+ if test -n "$PKG_CONFIG" && \
64716616 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbisfile\""; } >&5
64726617 ($PKG_CONFIG --exists --print-errors "vorbisfile") 2>&5
64736618 ac_status=$?
@@ -6474,17 +6619,18 @@
64746619 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
64756620 test $ac_status = 0; }; then
64766621 pkg_cv_VORBISFILE_CFLAGS=`$PKG_CONFIG --cflags "vorbisfile" 2>/dev/null`
6477- test "x$?" != "x0" && pkg_failed=yes
64786622 else
64796623 pkg_failed=yes
64806624 fi
6481- else
6482- pkg_failed=untried
6625+ fi
6626+else
6627+ pkg_failed=untried
64836628 fi
6484-if test -n "$VORBISFILE_LIBS"; then
6485- pkg_cv_VORBISFILE_LIBS="$VORBISFILE_LIBS"
6486- elif test -n "$PKG_CONFIG"; then
6487- if test -n "$PKG_CONFIG" && \
6629+if test -n "$PKG_CONFIG"; then
6630+ if test -n "$VORBISFILE_LIBS"; then
6631+ pkg_cv_VORBISFILE_LIBS="$VORBISFILE_LIBS"
6632+ else
6633+ if test -n "$PKG_CONFIG" && \
64886634 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vorbisfile\""; } >&5
64896635 ($PKG_CONFIG --exists --print-errors "vorbisfile") 2>&5
64906636 ac_status=$?
@@ -6491,19 +6637,17 @@
64916637 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
64926638 test $ac_status = 0; }; then
64936639 pkg_cv_VORBISFILE_LIBS=`$PKG_CONFIG --libs "vorbisfile" 2>/dev/null`
6494- test "x$?" != "x0" && pkg_failed=yes
64956640 else
64966641 pkg_failed=yes
64976642 fi
6498- else
6499- pkg_failed=untried
6643+ fi
6644+else
6645+ pkg_failed=untried
65006646 fi
65016647
65026648
65036649
65046650 if test $pkg_failed = yes; then
6505- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6506-$as_echo "no" >&6; }
65076651
65086652 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
65096653 _pkg_short_errors_supported=yes
@@ -6511,9 +6655,9 @@
65116655 _pkg_short_errors_supported=no
65126656 fi
65136657 if test $_pkg_short_errors_supported = yes; then
6514- VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "vorbisfile" 2>&1`
6658+ VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "vorbisfile"`
65156659 else
6516- VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vorbisfile" 2>&1`
6660+ VORBISFILE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "vorbisfile"`
65176661 fi
65186662 # Put the nasty error message in config.log where it belongs
65196663 echo "$VORBISFILE_PKG_ERRORS" >&5
@@ -6527,10 +6671,9 @@
65276671
65286672 Alternatively, you may set the environment variables VORBISFILE_CFLAGS
65296673 and VORBISFILE_LIBS to avoid the need to call pkg-config.
6530-See the pkg-config man page for more details." "$LINENO" 5
6674+See the pkg-config man page for more details.
6675+" "$LINENO" 5
65316676 elif test $pkg_failed = untried; then
6532- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6533-$as_echo "no" >&6; }
65346677 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
65356678 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
65366679 as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
@@ -6541,8 +6684,8 @@
65416684 and VORBISFILE_LIBS to avoid the need to call pkg-config.
65426685 See the pkg-config man page for more details.
65436686
6544-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
6545-See \`config.log' for more details" "$LINENO" 5; }
6687+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
6688+See \`config.log' for more details" "$LINENO" 5 ; }
65466689 else
65476690 VORBISFILE_CFLAGS=$pkg_cv_VORBISFILE_CFLAGS
65486691 VORBISFILE_LIBS=$pkg_cv_VORBISFILE_LIBS
@@ -6730,7 +6873,7 @@
67306873
67316874 case "$target" in
67326875 *-*-cygwin* | *-*-mingw32*)
6733- SYS_GL_LIBS="-lGLEW -lopengl32 -lglu32"
6876+ SYS_GL_LIBS="$SYS_GL_LIBS -lGLEW -lopengl32 -lglu32 -lpthread"
67346877 LIBS="$LIBS -lstdc++"
67356878 ;;
67366879 *-*-darwin*)
@@ -7436,7 +7579,7 @@
74367579 # report actual input values of CONFIG_FILES etc. instead of their
74377580 # values after options handling.
74387581 ac_log="
7439-This file was extended by Aleph One/SDL $as_me 20111202, which was
7582+This file was extended by Aleph One JP/SDL $as_me 20120210, which was
74407583 generated by GNU Autoconf 2.68. Invocation command line was
74417584
74427585 CONFIG_FILES = $CONFIG_FILES
@@ -7496,13 +7639,14 @@
74967639 Configuration commands:
74977640 $config_commands
74987641
7499-Report bugs to <http://sourceforge.net/bugs/?group_id=1997>."
7642+Report bugs to <http://forum.logue.be/index.php?board=8.0>.
7643+Aleph One JP/SDL home page: <http://sourceforge.jp/projects/marathon/ >."
75007644
75017645 _ACEOF
75027646 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
75037647 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
75047648 ac_cs_version="\\
7505-Aleph One/SDL config.status 20111202
7649+Aleph One JP/SDL config.status 20120210
75067650 configured by $0, generated by GNU Autoconf 2.68,
75077651 with options \\"\$ac_cs_config\\"
75087652
@@ -7656,7 +7800,7 @@
76567800 "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
76577801 "data/default_theme/Makefile") CONFIG_FILES="$CONFIG_FILES data/default_theme/Makefile" ;;
76587802
7659- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
7803+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
76607804 esac
76617805 done
76627806
@@ -7974,7 +8118,7 @@
79748118 esac
79758119 case $ac_mode$ac_tag in
79768120 :[FHL]*:*);;
7977- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
8121+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
79788122 :[FH]-) ac_tag=-:-;;
79798123 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
79808124 esac
@@ -8002,7 +8146,7 @@
80028146 [\\/$]*) false;;
80038147 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
80048148 esac ||
8005- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
8149+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
80068150 esac
80078151 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
80088152 as_fn_append ac_file_inputs " '$ac_f'"
@@ -8029,7 +8173,7 @@
80298173
80308174 case $ac_tag in
80318175 *:-:* | *:-) cat >"$ac_tmp/stdin" \
8032- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
8176+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
80338177 esac
80348178 ;;
80358179 esac
--- marathon/trunk/Source_Files/Expat/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Expat/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Expat
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -111,8 +112,6 @@
111112 PACKAGE_VERSION = @PACKAGE_VERSION@
112113 PATH_SEPARATOR = @PATH_SEPARATOR@
113114 PKG_CONFIG = @PKG_CONFIG@
114-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
115-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
116115 PNG_CFLAGS = @PNG_CFLAGS@
117116 PNG_LIBS = @PNG_LIBS@
118117 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/GameWorld/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/GameWorld/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/GameWorld
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -121,8 +122,6 @@
121122 PACKAGE_VERSION = @PACKAGE_VERSION@
122123 PATH_SEPARATOR = @PATH_SEPARATOR@
123124 PKG_CONFIG = @PKG_CONFIG@
124-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
125-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
126125 PNG_CFLAGS = @PNG_CFLAGS@
127126 PNG_LIBS = @PNG_LIBS@
128127 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Lua/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Lua/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Lua
3939 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -128,8 +129,6 @@
128129 PACKAGE_VERSION = @PACKAGE_VERSION@
129130 PATH_SEPARATOR = @PATH_SEPARATOR@
130131 PKG_CONFIG = @PKG_CONFIG@
131-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
132-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
133132 PNG_CFLAGS = @PNG_CFLAGS@
134133 PNG_LIBS = @PNG_LIBS@
135134 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/RenderOther/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/RenderOther/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/RenderOther
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -145,8 +146,6 @@
145146 PACKAGE_VERSION = @PACKAGE_VERSION@
146147 PATH_SEPARATOR = @PATH_SEPARATOR@
147148 PKG_CONFIG = @PKG_CONFIG@
148-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
149-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
150149 PNG_CFLAGS = @PNG_CFLAGS@
151150 PNG_LIBS = @PNG_LIBS@
152151 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Makefile.in (revision 516)
@@ -36,11 +36,14 @@
3636 host_triplet = @host@
3737 target_triplet = @target@
3838 @MAKE_WINDOWS_FALSE@bin_PROGRAMS = alephone$(EXEEXT)
39-@MAKE_WINDOWS_TRUE@bin_PROGRAMS = AlephOne$(EXEEXT)
39+@MAKE_WINDOWS_TRUE@bin_PROGRAMS = AlephOne$(EXEEXT) Marathon$(EXEEXT) \
40+@MAKE_WINDOWS_TRUE@ Marathon2$(EXEEXT) \
41+@MAKE_WINDOWS_TRUE@ MarathonInfinity$(EXEEXT)
4042 subdir = Source_Files
4143 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4244 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
43-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
45+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
46+ $(top_srcdir)/configure.ac
4447 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4548 $(ACLOCAL_M4)
4649 mkinstalldirs = $(install_sh) -d
@@ -54,6 +57,16 @@
5457 am_AlephOne_OBJECTS = $(am__objects_1)
5558 AlephOne_OBJECTS = $(am_AlephOne_OBJECTS)
5659 AlephOne_DEPENDENCIES = $(alephone_LDADD) alephone-resources.o
60+am_Marathon_OBJECTS = $(am__objects_1)
61+Marathon_OBJECTS = $(am_Marathon_OBJECTS)
62+Marathon_DEPENDENCIES = $(alephone_LDADD) marathon-resources.o
63+am_Marathon2_OBJECTS = $(am__objects_1)
64+Marathon2_OBJECTS = $(am_Marathon2_OBJECTS)
65+Marathon2_DEPENDENCIES = $(alephone_LDADD) marathon2-resources.o
66+am_MarathonInfinity_OBJECTS = $(am__objects_1)
67+MarathonInfinity_OBJECTS = $(am_MarathonInfinity_OBJECTS)
68+MarathonInfinity_DEPENDENCIES = $(alephone_LDADD) \
69+ marathon-infinity-resources.o
5770 am_alephone_OBJECTS = shell.$(OBJEXT) shell_misc.$(OBJEXT) \
5871 DefaultStringSets.$(OBJEXT)
5972 alephone_OBJECTS = $(am_alephone_OBJECTS)
@@ -82,8 +95,11 @@
8295 $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
8396 CCLD = $(CC)
8497 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
85-SOURCES = $(AlephOne_SOURCES) $(alephone_SOURCES)
86-DIST_SOURCES = $(AlephOne_SOURCES) $(alephone_SOURCES)
98+SOURCES = $(AlephOne_SOURCES) $(Marathon_SOURCES) $(Marathon2_SOURCES) \
99+ $(MarathonInfinity_SOURCES) $(alephone_SOURCES)
100+DIST_SOURCES = $(AlephOne_SOURCES) $(Marathon_SOURCES) \
101+ $(Marathon2_SOURCES) $(MarathonInfinity_SOURCES) \
102+ $(alephone_SOURCES)
87103 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
88104 html-recursive info-recursive install-data-recursive \
89105 install-dvi-recursive install-exec-recursive \
@@ -170,8 +186,6 @@
170186 PACKAGE_VERSION = @PACKAGE_VERSION@
171187 PATH_SEPARATOR = @PATH_SEPARATOR@
172188 PKG_CONFIG = @PKG_CONFIG@
173-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
174-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
175189 PNG_CFLAGS = @PNG_CFLAGS@
176190 PNG_LIBS = @PNG_LIBS@
177191 RANLIB = @RANLIB@
@@ -274,6 +288,12 @@
274288
275289 AlephOne_LDADD = $(alephone_LDADD) alephone-resources.o
276290 AlephOne_SOURCES = $(alephone_SOURCES)
291+Marathon_LDADD = $(alephone_LDADD) marathon-resources.o
292+Marathon_SOURCES = $(alephone_SOURCES)
293+Marathon2_LDADD = $(alephone_LDADD) marathon2-resources.o
294+Marathon2_SOURCES = $(alephone_SOURCES)
295+MarathonInfinity_LDADD = $(alephone_LDADD) marathon-infinity-resources.o
296+MarathonInfinity_SOURCES = $(alephone_SOURCES)
277297 DISTCLEANFILES = confpaths.h
278298 @MAKE_WINDOWS_TRUE@BUILD_YEAR = `echo $(VERSION) | cut -c 1-4`
279299 @MAKE_WINDOWS_TRUE@BUILD_MONTH = `echo $(VERSION) | cut -c 5-6 | sed -e s/^0//`
@@ -354,6 +374,15 @@
354374 AlephOne$(EXEEXT): $(AlephOne_OBJECTS) $(AlephOne_DEPENDENCIES)
355375 @rm -f AlephOne$(EXEEXT)
356376 $(CXXLINK) $(AlephOne_OBJECTS) $(AlephOne_LDADD) $(LIBS)
377+Marathon$(EXEEXT): $(Marathon_OBJECTS) $(Marathon_DEPENDENCIES)
378+ @rm -f Marathon$(EXEEXT)
379+ $(CXXLINK) $(Marathon_OBJECTS) $(Marathon_LDADD) $(LIBS)
380+Marathon2$(EXEEXT): $(Marathon2_OBJECTS) $(Marathon2_DEPENDENCIES)
381+ @rm -f Marathon2$(EXEEXT)
382+ $(CXXLINK) $(Marathon2_OBJECTS) $(Marathon2_LDADD) $(LIBS)
383+MarathonInfinity$(EXEEXT): $(MarathonInfinity_OBJECTS) $(MarathonInfinity_DEPENDENCIES)
384+ @rm -f MarathonInfinity$(EXEEXT)
385+ $(CXXLINK) $(MarathonInfinity_OBJECTS) $(MarathonInfinity_LDADD) $(LIBS)
357386 alephone$(EXEEXT): $(alephone_OBJECTS) $(alephone_DEPENDENCIES)
358387 @rm -f alephone$(EXEEXT)
359388 $(CXXLINK) $(alephone_OBJECTS) $(alephone_LDADD) $(LIBS)
@@ -715,11 +744,18 @@
715744 confpaths.h: Makefile
716745 echo "#define PKGDATADIR \"$(pkgdatadir)\"" > $@
717746
718-alephone-resources.o: FORCE
719- sed -e s/BUILDDATE/`date +%Y-%m-%d`/g -e "s/WIN_VERSION_STRING/$(WIN_VERSION_STRING)/g" -e "s/A1_DISPLAY_VERSION/$(A1_DISPLAY_VERSION)/g" $(top_srcdir)/Resources/Windows/alephone.rc | @WINDRES@ -I$(top_srcdir)/Resources/Windows -o alephone-resources.o
747+alephone-resources.o: $(top_srcdir)/Resources/Windows/alephone.rc Misc/alephversion.h
748+ sed -e "s/WIN_VERSION_STRING/$(WIN_VERSION_STRING)/g" -e "s/A1_DISPLAY_VERSION/$(A1_DISPLAY_VERSION)/g" $(top_srcdir)/Resources/Windows/alephone.rc | @WINDRES@ -I$(top_srcdir)/Resources/Windows -o alephone-resources.o
720749
721-FORCE:
750+marathon-resources.o: $(top_srcdir)/Resources/Windows/marathon.rc Misc/alephversion.h $(top_srcdir)/Resources/Windows/marathon.ico
751+ sed -e "s/WIN_VERSION_STRING/$(WIN_VERSION_STRING)/g" -e "s/A1_DISPLAY_VERSION/$(A1_DISPLAY_VERSION)/g" $(top_srcdir)/Resources/Windows/marathon.rc | @WINDRES@ -I$(top_srcdir)/Resources/Windows -o marathon-resources.o
722752
753+marathon2-resources.o: $(top_srcdir)/Resources/Windows/marathon2.rc Misc/alephversion.h $(top_srcdir)/Resources/Windows/marathon2.ico
754+ sed -e "s/WIN_VERSION_STRING/$(WIN_VERSION_STRING)/g" -e "s/A1_DISPLAY_VERSION/$(A1_DISPLAY_VERSION)/g" $(top_srcdir)/Resources/Windows/marathon2.rc | @WINDRES@ -I$(top_srcdir)/Resources/Windows -o marathon2-resources.o
755+
756+marathon-infinity-resources.o: $(top_srcdir)/Resources/Windows/marathon-infinity.rc Misc/alephversion.h $(top_srcdir)/Resources/Windows/marathon-infinity.ico
757+ sed -e "s/WIN_VERSION_STRING/$(WIN_VERSION_STRING)/g" -e "s/A1_DISPLAY_VERSION/$(A1_DISPLAY_VERSION)/g" $(top_srcdir)/Resources/Windows/marathon-infinity.rc | @WINDRES@ -I$(top_srcdir)/Resources/Windows -o marathon-infinity-resources.o
758+
723759 shell.o: confpaths.h
724760
725761 # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- marathon/trunk/Source_Files/RenderMain/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/RenderMain/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/RenderMain
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -146,8 +147,6 @@
146147 PACKAGE_VERSION = @PACKAGE_VERSION@
147148 PATH_SEPARATOR = @PATH_SEPARATOR@
148149 PKG_CONFIG = @PKG_CONFIG@
149-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
150-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
151150 PNG_CFLAGS = @PNG_CFLAGS@
152151 PNG_LIBS = @PNG_LIBS@
153152 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Sound/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Sound/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Sound
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -119,8 +120,6 @@
119120 PACKAGE_VERSION = @PACKAGE_VERSION@
120121 PATH_SEPARATOR = @PATH_SEPARATOR@
121122 PKG_CONFIG = @PKG_CONFIG@
122-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
123-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
124123 PNG_CFLAGS = @PNG_CFLAGS@
125124 PNG_LIBS = @PNG_LIBS@
126125 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Network/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Network/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Network
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -186,8 +187,6 @@
186187 PACKAGE_VERSION = @PACKAGE_VERSION@
187188 PATH_SEPARATOR = @PATH_SEPARATOR@
188189 PKG_CONFIG = @PKG_CONFIG@
189-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
190-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
191190 PNG_CFLAGS = @PNG_CFLAGS@
192191 PNG_LIBS = @PNG_LIBS@
193192 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Network/Metaserver/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Network/Metaserver/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Network/Metaserver
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -117,8 +118,6 @@
117118 PACKAGE_VERSION = @PACKAGE_VERSION@
118119 PATH_SEPARATOR = @PATH_SEPARATOR@
119120 PKG_CONFIG = @PKG_CONFIG@
120-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
121-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
122121 PNG_CFLAGS = @PNG_CFLAGS@
123122 PNG_LIBS = @PNG_LIBS@
124123 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Misc/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Misc/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Misc
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -58,13 +59,13 @@
5859 progress.h Random.h Scenario.h sdl_dialogs.h sdl_network.h \
5960 sdl_widgets.h shared_widgets.h thread_priority_sdl.h \
6061 vbl_definitions.h vbl.h VecOps.h WindowedNthElementFinder.h \
61- AlephSansMono-Bold.h ActionQueues.cpp CircularByteBuffer.cpp \
62- Console.cpp game_errors.cpp interface.cpp Logging.cpp \
63- PlayerImage_sdl.cpp PlayerName.cpp preferences.cpp \
64- preference_dialogs.cpp preferences_widgets_sdl.cpp \
65- Scenario.cpp sdl_dialogs.cpp thread_priority_sdl_posix.cpp \
66- thread_priority_sdl_win32.cpp sdl_widgets.cpp \
67- shared_widgets.cpp vbl.cpp
62+ AlephSansMono-Bold.h powered_by_alephone.h ActionQueues.cpp \
63+ CircularByteBuffer.cpp Console.cpp game_errors.cpp \
64+ interface.cpp Logging.cpp PlayerImage_sdl.cpp PlayerName.cpp \
65+ preferences.cpp preference_dialogs.cpp \
66+ preferences_widgets_sdl.cpp Scenario.cpp sdl_dialogs.cpp \
67+ thread_priority_sdl_posix.cpp thread_priority_sdl_win32.cpp \
68+ sdl_widgets.cpp shared_widgets.cpp vbl.cpp
6869 @MAKE_WINDOWS_FALSE@am__objects_1 = \
6970 @MAKE_WINDOWS_FALSE@ thread_priority_sdl_posix.$(OBJEXT)
7071 @MAKE_WINDOWS_TRUE@am__objects_1 = \
@@ -142,8 +143,6 @@
142143 PACKAGE_VERSION = @PACKAGE_VERSION@
143144 PATH_SEPARATOR = @PATH_SEPARATOR@
144145 PKG_CONFIG = @PKG_CONFIG@
145-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
146-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
147146 PNG_CFLAGS = @PNG_CFLAGS@
148147 PNG_LIBS = @PNG_LIBS@
149148 RANLIB = @RANLIB@
@@ -224,7 +223,7 @@
224223 PlayerName.h preference_dialogs.h preferences.h \
225224 preferences_widgets_sdl.h progress.h Random.h Scenario.h sdl_dialogs.h sdl_network.h \
226225 sdl_widgets.h shared_widgets.h thread_priority_sdl.h vbl_definitions.h vbl.h VecOps.h \
227- WindowedNthElementFinder.h AlephSansMono-Bold.h \
226+ WindowedNthElementFinder.h AlephSansMono-Bold.h powered_by_alephone.h \
228227 \
229228 ActionQueues.cpp CircularByteBuffer.cpp Console.cpp game_errors.cpp \
230229 interface.cpp \
--- marathon/trunk/Source_Files/Misc/preferences.cpp (revision 515)
+++ marathon/trunk/Source_Files/Misc/preferences.cpp (revision 516)
@@ -932,7 +932,7 @@
932932
933933 #ifndef HAVE_OPENGL
934934
935- placer->dual_add(new w_static_text("このAleph Oneのコピーは、OpenGLをサポートしないビルドです。"), d);#endif
935+ placer->dual_add(new w_static_text("このAleph Oneのコピーは、OpenGLをサポートしないビルドです。"), d);
936936 #endif
937937 placer->add(new w_spacer(), true);
938938
@@ -1842,7 +1842,7 @@
18421842
18431843 w_file_chooser *hud_lua_w = new w_file_chooser("スクリプトを選ぶ", _typecode_netscript);
18441844 hud_lua_w->set_file(environment_preferences->hud_lua_file);
1845- table->dual_add(hud_lua_w->label("Script File"), d);
1845+ table->dual_add(hud_lua_w->label("スクリプトファイル"), d);
18461846 table->dual_add(hud_lua_w, d);
18471847 use_hud_lua_w->add_dependent_widget(hud_lua_w);
18481848
--- marathon/trunk/Source_Files/Misc/alephversion.h (revision 515)
+++ marathon/trunk/Source_Files/Misc/alephversion.h (revision 516)
@@ -23,10 +23,10 @@
2323 */
2424
2525
26-#define A1_DISPLAY_NAME "Aleph One JP"
27-#define A1_DISPLAY_VERSION "1.0JP3"
28-#define A1_DISPLAY_DATE_VERSION "2011-12-26"
29-#define A1_DATE_VERSION "20111226"
26+#define A1_DISPLAY_NAME "Aleph One"
27+#define A1_DISPLAY_VERSION "1.0.1JP1"
28+#define A1_DISPLAY_DATE_VERSION "2011-02-10"
29+#define A1_DATE_VERSION "20120210"
3030
3131 #ifdef WIN32
3232 #define A1_DISPLAY_PLATFORM "Windows"
--- marathon/trunk/Source_Files/ModelView/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/ModelView/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/ModelView
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -117,8 +118,6 @@
117118 PACKAGE_VERSION = @PACKAGE_VERSION@
118119 PATH_SEPARATOR = @PATH_SEPARATOR@
119120 PKG_CONFIG = @PKG_CONFIG@
120-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
121-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
122121 PNG_CFLAGS = @PNG_CFLAGS@
123122 PNG_LIBS = @PNG_LIBS@
124123 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/CSeries/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/CSeries/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/CSeries
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -119,8 +120,6 @@
119120 PACKAGE_VERSION = @PACKAGE_VERSION@
120121 PATH_SEPARATOR = @PATH_SEPARATOR@
121122 PKG_CONFIG = @PKG_CONFIG@
122-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
123-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
124123 PNG_CFLAGS = @PNG_CFLAGS@
125124 PNG_LIBS = @PNG_LIBS@
126125 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Input/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Input/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Input
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -115,8 +116,6 @@
115116 PACKAGE_VERSION = @PACKAGE_VERSION@
116117 PATH_SEPARATOR = @PATH_SEPARATOR@
117118 PKG_CONFIG = @PKG_CONFIG@
118-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
119-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
120119 PNG_CFLAGS = @PNG_CFLAGS@
121120 PNG_LIBS = @PNG_LIBS@
122121 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/XML/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/XML/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/XML
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -119,8 +120,6 @@
119120 PACKAGE_VERSION = @PACKAGE_VERSION@
120121 PATH_SEPARATOR = @PATH_SEPARATOR@
121122 PKG_CONFIG = @PKG_CONFIG@
122-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
123-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
124123 PNG_CFLAGS = @PNG_CFLAGS@
125124 PNG_LIBS = @PNG_LIBS@
126125 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/Files/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/Files/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/Files
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -131,8 +132,6 @@
131132 PACKAGE_VERSION = @PACKAGE_VERSION@
132133 PATH_SEPARATOR = @PATH_SEPARATOR@
133134 PKG_CONFIG = @PKG_CONFIG@
134-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
135-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
136135 PNG_CFLAGS = @PNG_CFLAGS@
137136 PNG_LIBS = @PNG_LIBS@
138137 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/LibNAT/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/LibNAT/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/LibNAT
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -117,8 +118,6 @@
117118 PACKAGE_VERSION = @PACKAGE_VERSION@
118119 PATH_SEPARATOR = @PATH_SEPARATOR@
119120 PKG_CONFIG = @PKG_CONFIG@
120-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
121-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
122121 PNG_CFLAGS = @PNG_CFLAGS@
123122 PNG_LIBS = @PNG_LIBS@
124123 RANLIB = @RANLIB@
--- marathon/trunk/Source_Files/TCPMess/Makefile.in (revision 515)
+++ marathon/trunk/Source_Files/TCPMess/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = Source_Files/TCPMess
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -117,8 +118,6 @@
117118 PACKAGE_VERSION = @PACKAGE_VERSION@
118119 PATH_SEPARATOR = @PATH_SEPARATOR@
119120 PKG_CONFIG = @PKG_CONFIG@
120-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
121-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
122121 PNG_CFLAGS = @PNG_CFLAGS@
123122 PNG_LIBS = @PNG_LIBS@
124123 RANLIB = @RANLIB@
--- marathon/trunk/Makefile.in (revision 515)
+++ marathon/trunk/Makefile.in (revision 516)
@@ -41,7 +41,8 @@
4141 ChangeLog THANKS config.guess config.sub depcomp install-sh \
4242 missing
4343 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
44+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
45+ $(top_srcdir)/configure.ac
4546 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4647 $(ACLOCAL_M4)
4748 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -173,8 +174,6 @@
173174 PACKAGE_VERSION = @PACKAGE_VERSION@
174175 PATH_SEPARATOR = @PATH_SEPARATOR@
175176 PKG_CONFIG = @PKG_CONFIG@
176-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
177-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
178177 PNG_CFLAGS = @PNG_CFLAGS@
179178 PNG_LIBS = @PNG_LIBS@
180179 RANLIB = @RANLIB@
--- marathon/trunk/mingw.sh (nonexistent)
+++ marathon/trunk/mingw.sh (revision 516)
@@ -0,0 +1,2 @@
1+#!/bin/sh
2+LDFLAGS="-Wl,-S" LIBS="-lfreetype -lvorbis -logg -ltiff -ljpeg -lpng -lz -lstdc++ -lws2_32 -Ic:/mingw32/lib" ./configure
--- marathon/trunk/tools/Makefile.in (revision 515)
+++ marathon/trunk/tools/Makefile.in (revision 516)
@@ -42,7 +42,8 @@
4242 subdir = tools
4343 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4444 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
45-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
45+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
46+ $(top_srcdir)/configure.ac
4647 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4748 $(ACLOCAL_M4)
4849 mkinstalldirs = $(install_sh) -d
@@ -97,8 +98,6 @@
9798 PACKAGE_VERSION = @PACKAGE_VERSION@
9899 PATH_SEPARATOR = @PATH_SEPARATOR@
99100 PKG_CONFIG = @PKG_CONFIG@
100-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
101-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
102101 PNG_CFLAGS = @PNG_CFLAGS@
103102 PNG_LIBS = @PNG_LIBS@
104103 RANLIB = @RANLIB@
--- marathon/trunk/configure.ac (revision 515)
+++ marathon/trunk/configure.ac (revision 516)
@@ -1,7 +1,7 @@
11 dnl Process this file with autoconf to produce a configure script.
22 dnl Written in 2000 by Christian Bauer <Christian.Bauer@uni-mainz.de>
33
4-AC_INIT([Aleph One/SDL], m4_esyscmd([ grep '^#define A1_DATE_VERSION' Source_Files/Misc/alephversion.h | sed -e 's/\(.*\"\)\(.*\)\(\"\)/\2/g' | tr -d '\n']), [http://sourceforge.net/bugs/?group_id=1997], [AlephOne])
4+AC_INIT([Aleph One JP/SDL], m4_esyscmd([ grep '^#define A1_DATE_VERSION' Source_Files/Misc/alephversion.h | sed -e 's/\(.*\"\)\(.*\)\(\"\)/\2/g' | tr -d '\n']), [http://forum.logue.be/index.php?board=8.0], [AlephOneJP], [http://sourceforge.jp/projects/marathon/] )
55 AC_CONFIG_SRCDIR([Source_Files/shell.cpp])
66 AC_PREREQ(2.52)
77
@@ -9,6 +9,9 @@
99 AC_CANONICAL_HOST
1010 AC_CANONICAL_TARGET
1111
12+m4_include([m4/sdl.m4])
13+m4_include([m4/pkg.m4])
14+
1215 dnl Init automake.
1316 AM_INIT_AUTOMAKE
1417 AM_CONFIG_HEADER(config.h)
@@ -73,6 +76,13 @@
7376 AC_DEFINE(LUA_USE_MKSTEMP, 1, [mkstemp() is available])
7477 ])
7578
79+dnl On some systems iconv is in a separate library, and may actually be named
80+dnl libiconv.
81+AC_CHECK_LIB(iconv, libiconv)
82+if test $ac_cv_lib_iconv_libiconv = no; then
83+ AC_CHECK_LIB(iconv, iconv , AC_MSG_ERROR([You need iconv to run Aleph One JP.]))
84+fi
85+
7686 dnl Check for SDL.
7787 AM_PATH_SDL(1.2.0, , AC_MSG_ERROR([You need SDL 1.2 to run Aleph One.]))
7888 CPPFLAGS="$CPPFLAGS $SDL_CFLAGS -DSDL"
@@ -218,7 +228,7 @@
218228 dnl Figure out which OpenGL library to use
219229 case "$target" in
220230 *-*-cygwin* | *-*-mingw32*)
221- SYS_GL_LIBS="-lGLEW -lopengl32 -lglu32"
231+ SYS_GL_LIBS="$SYS_GL_LIBS -lGLEW -lopengl32 -lglu32 -lpthread"
222232 LIBS="$LIBS -lstdc++"
223233 ;;
224234 *-*-darwin*)
--- marathon/trunk/data/Makefile.in (revision 515)
+++ marathon/trunk/data/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = data
3939 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -156,8 +157,6 @@
156157 PACKAGE_VERSION = @PACKAGE_VERSION@
157158 PATH_SEPARATOR = @PATH_SEPARATOR@
158159 PKG_CONFIG = @PKG_CONFIG@
159-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
160-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
161160 PNG_CFLAGS = @PNG_CFLAGS@
162161 PNG_LIBS = @PNG_LIBS@
163162 RANLIB = @RANLIB@
@@ -229,7 +228,7 @@
229228 top_builddir = @top_builddir@
230229 top_srcdir = @top_srcdir@
231230 SUBDIRS = default_theme
232-pkgdata_DATA = Fonts.ttf
231+pkgdata_DATA = Fonts
233232 mmldir = $(pkgdatadir)/MML
234233 mml_DATA = Interface_Rects.mml Transparent_Liquids.mml \
235234 Transparent_Sprites.mml
--- marathon/trunk/data/default_theme/Makefile.in (revision 515)
+++ marathon/trunk/data/default_theme/Makefile.in (revision 516)
@@ -38,7 +38,8 @@
3838 subdir = data/default_theme
3939 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
4040 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
41-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
41+am__aclocal_m4_deps = $(top_srcdir)/m4/sdl.m4 $(top_srcdir)/m4/pkg.m4 \
42+ $(top_srcdir)/configure.ac
4243 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
4344 $(ACLOCAL_M4)
4445 mkinstalldirs = $(install_sh) -d
@@ -116,8 +117,6 @@
116117 PACKAGE_VERSION = @PACKAGE_VERSION@
117118 PATH_SEPARATOR = @PATH_SEPARATOR@
118119 PKG_CONFIG = @PKG_CONFIG@
119-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
120-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
121120 PNG_CFLAGS = @PNG_CFLAGS@
122121 PNG_LIBS = @PNG_LIBS@
123122 RANLIB = @RANLIB@
--- marathon/trunk/AlephOne.spec (revision 515)
+++ marathon/trunk/AlephOne.spec (revision 516)
@@ -1,5 +1,5 @@
1-%define name AlephOne_JP
2-%define version 20111202
1+%define name AlephOneJP
2+%define version 20120210
33 %define release 1
44
55 Summary: 3D first-person shooter game
--- marathon/trunk/config.h.in (revision 515)
+++ marathon/trunk/config.h.in (revision 516)
@@ -12,6 +12,9 @@
1212 /* Define to 1 if you have the <inttypes.h> header file. */
1313 #undef HAVE_INTTYPES_H
1414
15+/* Define to 1 if you have the `iconv' library (-liconv). */
16+#undef HAVE_LIBICONV
17+
1518 /* Lua support is enabled */
1619 #undef HAVE_LUA
1720
--- marathon/trunk/aclocal.m4 (revision 515)
+++ marathon/trunk/aclocal.m4 (revision 516)
@@ -19,350 +19,6 @@
1919 If you have problems, you may need to regenerate the build system entirely.
2020 To do so, use the procedure documented by the package, typically `autoreconf'.])])
2121
22-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
23-# serial 1 (pkg-config-0.24)
24-#
25-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
26-#
27-# This program is free software; you can redistribute it and/or modify
28-# it under the terms of the GNU General Public License as published by
29-# the Free Software Foundation; either version 2 of the License, or
30-# (at your option) any later version.
31-#
32-# This program is distributed in the hope that it will be useful, but
33-# WITHOUT ANY WARRANTY; without even the implied warranty of
34-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
35-# General Public License for more details.
36-#
37-# You should have received a copy of the GNU General Public License
38-# along with this program; if not, write to the Free Software
39-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
40-#
41-# As a special exception to the GNU General Public License, if you
42-# distribute this file as part of a program that contains a
43-# configuration script generated by Autoconf, you may include it under
44-# the same distribution terms that you use for the rest of that program.
45-
46-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
47-# ----------------------------------
48-AC_DEFUN([PKG_PROG_PKG_CONFIG],
49-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
50-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
51-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
52-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
53-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
54-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
55-
56-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
57- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
58-fi
59-if test -n "$PKG_CONFIG"; then
60- _pkg_min_version=m4_default([$1], [0.9.0])
61- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
62- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
63- AC_MSG_RESULT([yes])
64- else
65- AC_MSG_RESULT([no])
66- PKG_CONFIG=""
67- fi
68-fi[]dnl
69-])# PKG_PROG_PKG_CONFIG
70-
71-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
72-#
73-# Check to see whether a particular set of modules exists. Similar
74-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
75-#
76-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
77-# only at the first occurence in configure.ac, so if the first place
78-# it's called might be skipped (such as if it is within an "if", you
79-# have to call PKG_CHECK_EXISTS manually
80-# --------------------------------------------------------------
81-AC_DEFUN([PKG_CHECK_EXISTS],
82-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
83-if test -n "$PKG_CONFIG" && \
84- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
85- m4_default([$2], [:])
86-m4_ifvaln([$3], [else
87- $3])dnl
88-fi])
89-
90-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
91-# ---------------------------------------------
92-m4_define([_PKG_CONFIG],
93-[if test -n "$$1"; then
94- pkg_cv_[]$1="$$1"
95- elif test -n "$PKG_CONFIG"; then
96- PKG_CHECK_EXISTS([$3],
97- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
98- test "x$?" != "x0" && pkg_failed=yes ],
99- [pkg_failed=yes])
100- else
101- pkg_failed=untried
102-fi[]dnl
103-])# _PKG_CONFIG
104-
105-# _PKG_SHORT_ERRORS_SUPPORTED
106-# -----------------------------
107-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
108-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
109-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
110- _pkg_short_errors_supported=yes
111-else
112- _pkg_short_errors_supported=no
113-fi[]dnl
114-])# _PKG_SHORT_ERRORS_SUPPORTED
115-
116-
117-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
118-# [ACTION-IF-NOT-FOUND])
119-#
120-#
121-# Note that if there is a possibility the first call to
122-# PKG_CHECK_MODULES might not happen, you should be sure to include an
123-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
124-#
125-#
126-# --------------------------------------------------------------
127-AC_DEFUN([PKG_CHECK_MODULES],
128-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
129-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
130-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
131-
132-pkg_failed=no
133-AC_MSG_CHECKING([for $1])
134-
135-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
136-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
137-
138-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
139-and $1[]_LIBS to avoid the need to call pkg-config.
140-See the pkg-config man page for more details.])
141-
142-if test $pkg_failed = yes; then
143- AC_MSG_RESULT([no])
144- _PKG_SHORT_ERRORS_SUPPORTED
145- if test $_pkg_short_errors_supported = yes; then
146- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
147- else
148- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
149- fi
150- # Put the nasty error message in config.log where it belongs
151- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
152-
153- m4_default([$4], [AC_MSG_ERROR(
154-[Package requirements ($2) were not met:
155-
156-$$1_PKG_ERRORS
157-
158-Consider adjusting the PKG_CONFIG_PATH environment variable if you
159-installed software in a non-standard prefix.
160-
161-_PKG_TEXT])[]dnl
162- ])
163-elif test $pkg_failed = untried; then
164- AC_MSG_RESULT([no])
165- m4_default([$4], [AC_MSG_FAILURE(
166-[The pkg-config script could not be found or is too old. Make sure it
167-is in your PATH or set the PKG_CONFIG environment variable to the full
168-path to pkg-config.
169-
170-_PKG_TEXT
171-
172-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
173- ])
174-else
175- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
176- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
177- AC_MSG_RESULT([yes])
178- $3
179-fi[]dnl
180-])# PKG_CHECK_MODULES
181-
182-# Configure paths for SDL
183-# Sam Lantinga 9/21/99
184-# stolen from Manish Singh
185-# stolen back from Frank Belew
186-# stolen from Manish Singh
187-# Shamelessly stolen from Owen Taylor
188-
189-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
190-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
191-dnl
192-AC_DEFUN([AM_PATH_SDL],
193-[dnl
194-dnl Get the cflags and libraries from the sdl-config script
195-dnl
196-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
197- sdl_prefix="$withval", sdl_prefix="")
198-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
199- sdl_exec_prefix="$withval", sdl_exec_prefix="")
200-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
201- , enable_sdltest=yes)
202-
203- if test x$sdl_exec_prefix != x ; then
204- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
205- if test x${SDL_CONFIG+set} != xset ; then
206- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
207- fi
208- fi
209- if test x$sdl_prefix != x ; then
210- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
211- if test x${SDL_CONFIG+set} != xset ; then
212- SDL_CONFIG=$sdl_prefix/bin/sdl-config
213- fi
214- fi
215-
216- as_save_PATH="$PATH"
217- if test "x$prefix" != xNONE; then
218- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
219- fi
220- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
221- PATH="$as_save_PATH"
222- min_sdl_version=ifelse([$1], ,0.11.0,$1)
223- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
224- no_sdl=""
225- if test "$SDL_CONFIG" = "no" ; then
226- no_sdl=yes
227- else
228- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
229- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
230-
231- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
232- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
233- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
234- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
235- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
236- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
237- if test "x$enable_sdltest" = "xyes" ; then
238- ac_save_CFLAGS="$CFLAGS"
239- ac_save_CXXFLAGS="$CXXFLAGS"
240- ac_save_LIBS="$LIBS"
241- CFLAGS="$CFLAGS $SDL_CFLAGS"
242- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
243- LIBS="$LIBS $SDL_LIBS"
244-dnl
245-dnl Now check if the installed SDL is sufficiently new. (Also sanity
246-dnl checks the results of sdl-config to some extent
247-dnl
248- rm -f conf.sdltest
249- AC_TRY_RUN([
250-#include <stdio.h>
251-#include <stdlib.h>
252-#include <string.h>
253-#include "SDL.h"
254-
255-char*
256-my_strdup (char *str)
257-{
258- char *new_str;
259-
260- if (str)
261- {
262- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
263- strcpy (new_str, str);
264- }
265- else
266- new_str = NULL;
267-
268- return new_str;
269-}
270-
271-int main (int argc, char *argv[])
272-{
273- int major, minor, micro;
274- char *tmp_version;
275-
276- /* This hangs on some systems (?)
277- system ("touch conf.sdltest");
278- */
279- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
280-
281- /* HP/UX 9 (%@#!) writes to sscanf strings */
282- tmp_version = my_strdup("$min_sdl_version");
283- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
284- printf("%s, bad version string\n", "$min_sdl_version");
285- exit(1);
286- }
287-
288- if (($sdl_major_version > major) ||
289- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
290- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
291- {
292- return 0;
293- }
294- else
295- {
296- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
297- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
298- printf("*** best to upgrade to the required version.\n");
299- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
300- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
301- printf("*** config.cache before re-running configure\n");
302- return 1;
303- }
304-}
305-
306-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
307- CFLAGS="$ac_save_CFLAGS"
308- CXXFLAGS="$ac_save_CXXFLAGS"
309- LIBS="$ac_save_LIBS"
310- fi
311- fi
312- if test "x$no_sdl" = x ; then
313- AC_MSG_RESULT(yes)
314- ifelse([$2], , :, [$2])
315- else
316- AC_MSG_RESULT(no)
317- if test "$SDL_CONFIG" = "no" ; then
318- echo "*** The sdl-config script installed by SDL could not be found"
319- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
320- echo "*** your path, or set the SDL_CONFIG environment variable to the"
321- echo "*** full path to sdl-config."
322- else
323- if test -f conf.sdltest ; then
324- :
325- else
326- echo "*** Could not run SDL test program, checking why..."
327- CFLAGS="$CFLAGS $SDL_CFLAGS"
328- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
329- LIBS="$LIBS $SDL_LIBS"
330- AC_TRY_LINK([
331-#include <stdio.h>
332-#include "SDL.h"
333-
334-int main(int argc, char *argv[])
335-{ return 0; }
336-#undef main
337-#define main K_and_R_C_main
338-], [ return 0; ],
339- [ echo "*** The test program compiled, but did not run. This usually means"
340- echo "*** that the run-time linker is not finding SDL or finding the wrong"
341- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
342- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
343- echo "*** to the installed location Also, make sure you have run ldconfig if that"
344- echo "*** is required on your system"
345- echo "***"
346- echo "*** If you have an old version installed, it is best to remove it, although"
347- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
348- [ echo "*** The test program failed to compile or link. See the file config.log for the"
349- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
350- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
351- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
352- CFLAGS="$ac_save_CFLAGS"
353- CXXFLAGS="$ac_save_CXXFLAGS"
354- LIBS="$ac_save_LIBS"
355- fi
356- fi
357- SDL_CFLAGS=""
358- SDL_LIBS=""
359- ifelse([$3], , :, [$3])
360- fi
361- AC_SUBST(SDL_CFLAGS)
362- AC_SUBST(SDL_LIBS)
363- rm -f conf.sdltest
364-])
365-
36622 # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
36723 #
36824 # This file is free software; the Free Software Foundation
旧リポジトリブラウザで表示