CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <[EMAIL PROTECTED]> 05/04/05 15:03:04
Modified files:
. : configure.ac
src : wesconfig.h
Log message:
generate src/wesconfig.h at configure-time (bug #10340)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/wesconfig.h.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.131 wesnoth/configure.ac:1.132
--- wesnoth/configure.ac:1.131 Wed Mar 23 19:37:58 2005
+++ wesnoth/configure.ac Tue Apr 5 15:03:03 2005
@@ -5,11 +5,39 @@
#######################################################################
AC_PREREQ([2.57])
-AC_INIT([Battle for Wesnoth], [0.8.11+cvs], [EMAIL PROTECTED], [wesnoth])
-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.131 $])
+define([WESNOTH_VERSION],[0.8.11+cvs])
+
+dnl define([WESNOTH_DEFAULT_SERVER],[server.wesnoth.org])
+define([WESNOTH_DEFAULT_SERVER],[devsrv.wesnoth.org])
+
+AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, [EMAIL PROTECTED], [wesnoth])
+AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]WESNOTH_DEFAULT_SERVER["], [The default
server for this version])
+
+dnl
+dnl Generate wesconfig.h from the information above
+dnl
+AC_CONFIG_COMMANDS([src/wesconfig.h],
+ [cat > src/wesconfig.h <<EOF
+#ifndef WESCONFIG_H_INCLUDED
+#define WESCONFIG_H_INCLUDED
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#else
+# define VERSION "]WESNOTH_VERSION["
+# define WESNOTH_DEFAULT_SERVER "]WESNOTH_DEFAULT_SERVER["
+# define PACKAGE "wesnoth"
+# ifndef LOCALEDIR
+# define LOCALEDIR "translations"
+# endif
+#endif
+
+#endif
+EOF
+])
+
+AC_REVISION([$Revision: 1.132 $])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/actions.cpp])
Index: wesnoth/src/wesconfig.h
diff -u wesnoth/src/wesconfig.h:1.20 wesnoth/src/wesconfig.h:1.21
--- wesnoth/src/wesconfig.h:1.20 Sat Feb 19 22:21:27 2005
+++ wesnoth/src/wesconfig.h Tue Apr 5 15:03:03 2005
@@ -12,5 +12,4 @@
# endif
#endif
-
#endif
