Author: cazfi
Date: Sat Dec 6 23:23:35 2014
New Revision: 27204
URL: http://svn.gna.org/viewcvs/freeciv?rev=27204&view=rev
Log:
In addition to fc_config.h configuration headers used internally,
create gen_headers/freeciv_config.h header that contains only things
that can be sefely included to external packages.
Define FREECIV_META_URL there.
See patch #5419
Added:
trunk/gen_headers/
trunk/gen_headers/Makefile.am
trunk/gen_headers/freeciv_config.h.in
Modified:
trunk/Makefile.am
trunk/client/client_main.c
trunk/configure.ac
trunk/diff_ignore
trunk/server/Makefile.am
trunk/server/meta.h
Modified: trunk/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/Makefile.am?rev=27204&r1=27203&r2=27204&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Sat Dec 6 23:23:35 2014
@@ -25,7 +25,7 @@
DSUBDIRS =
endif
-SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS)
$(CSUBDIRS) translations doc tools
+SUBDIRS = $(DSUBDIRS) dependencies utility common tests win32 $(SSUBDIRS)
$(CSUBDIRS) translations doc tools gen_headers
## Automake should distribute config.rpath automatically - and new
## versions probably do. We still support versions that do not, so
Modified: trunk/client/client_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/client_main.c?rev=27204&r1=27203&r2=27204&view=diff
==============================================================================
--- trunk/client/client_main.c (original)
+++ trunk/client/client_main.c Sat Dec 6 23:23:35 2014
@@ -629,7 +629,7 @@
DEFAULT_METASERVER_OPTION);
}
if (0 == strcmp(options.default_metaserver, DEFAULT_METASERVER_OPTION)) {
- sz_strlcpy(metaserver, META_URL);
+ sz_strlcpy(metaserver, FREECIV_META_URL);
} else {
sz_strlcpy(metaserver, options.default_metaserver);
}
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=27204&r1=27203&r2=27204&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sat Dec 6 23:23:35 2014
@@ -8,7 +8,7 @@
AC_CONFIG_AUX_DIR(bootstrap) # This can't be quoted or automake will fail
AC_CONFIG_MACRO_DIR([m4])
ifdef([AC_CONFIG_MACRO_DIRS],[AC_CONFIG_MACRO_DIRS([dependencies/m4])])
-AC_CONFIG_HEADERS([fc_config.h])
+AC_CONFIG_HEADERS([fc_config.h gen_headers/freeciv_config.h])
AC_CANONICAL_HOST
AC_USE_SYSTEM_EXTENSIONS
AC_C_BIGENDIAN
@@ -19,7 +19,7 @@
AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated])
AC_DEFINE_UNQUOTED([BUG_URL], ["$BUG_URL"], [Bug reporting URL])
-AC_DEFINE(META_URL, "http://meta.freeciv.org/metaserver.php";, [Meta server
URL])
+AC_DEFINE([FREECIV_META_URL], ["http://meta.freeciv.org/metaserver.php";],
[Metaserver URL])
AC_DEFINE_UNQUOTED([WIKI_URL], ["$WIKI_URL"], [Informational URL])
AC_DEFINE(DEFAULT_SOCK_PORT, 5556, [Connection TCP Port])
@@ -1503,6 +1503,7 @@
server/scripting/Makefile
tools/Makefile
tools/ruledit/Makefile
+ gen_headers/Makefile
translations/Makefile
translations/freeciv/Makefile.in
translations/nations/Makefile.in
Modified: trunk/diff_ignore
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/diff_ignore?rev=27204&r1=27203&r2=27204&view=diff
==============================================================================
--- trunk/diff_ignore (original)
+++ trunk/diff_ignore Sat Dec 6 23:23:35 2014
@@ -43,6 +43,7 @@
config.guess
fc_config.h
fc_config.h.in
+freeciv_config.h
config.log
config.status
config.sub
Added: trunk/gen_headers/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/Makefile.am?rev=27204&view=auto
==============================================================================
--- trunk/gen_headers/Makefile.am (added)
+++ trunk/gen_headers/Makefile.am Sat Dec 6 23:23:35 2014
@@ -0,0 +1,4 @@
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST = \
+ freeciv_config.h.in
Added: trunk/gen_headers/freeciv_config.h.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=27204&view=auto
==============================================================================
--- trunk/gen_headers/freeciv_config.h.in (added)
+++ trunk/gen_headers/freeciv_config.h.in Sat Dec 6 23:23:35 2014
@@ -0,0 +1,26 @@
+/**********************************************************************
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***********************************************************************/
+
+/* This header is generated from include/freeciv_config.h.in.
+ * It contains values to specific freeciv build, but only such
+ * values that should not conflict with configuration headers from
+ * other autotools projects. This is meant to be usable for external
+ * projects building against some freeciv components. */
+
+#ifndef FC__FREECIV_CONFIG_H
+#define FC__FREECIV_CONFIG_H
+
+/* Metaserver URL */
+#undef FREECIV_META_URL
+
+#endif /* FC__FREECIV_CONFIG_H */
Modified: trunk/server/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/Makefile.am?rev=27204&r1=27203&r2=27204&view=diff
==============================================================================
--- trunk/server/Makefile.am (original)
+++ trunk/server/Makefile.am Sat Dec 6 23:23:35 2014
@@ -14,6 +14,7 @@
lib_LTLIBRARIES = libfreeciv-srv.la
AM_CPPFLAGS = \
+ -I$(top_builddir)/gen_headers \
-I$(top_srcdir)/ai \
-I$(top_srcdir)/ai/classic \
-I$(top_srcdir)/common \
Modified: trunk/server/meta.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.h?rev=27204&r1=27203&r2=27204&view=diff
==============================================================================
--- trunk/server/meta.h (original)
+++ trunk/server/meta.h Sat Dec 6 23:23:35 2014
@@ -13,10 +13,12 @@
#ifndef FC__META_H
#define FC__META_H
+#include "freeciv_config.h"
+
#include "support.h" /* bool type */
#define DEFAULT_META_SERVER_NO_SEND TRUE
-#define DEFAULT_META_SERVER_ADDR META_URL /* fc_config.h */
+#define DEFAULT_META_SERVER_ADDR FREECIV_META_URL
#define METASERVER_REFRESH_INTERVAL (3*60)
#define METASERVER_MIN_UPDATE_INTERVAL 7 /* not too short, not too long */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
