Author: cazfi
Date: Wed Apr 29 20:49:29 2015
New Revision: 28958
URL: http://svn.gna.org/viewcvs/freeciv?rev=28958&view=rev
Log:
Added support for build-time project definition file, initially containing
metaserver URL.
See patch #5746
Added:
trunk/bootstrap/freeciv.project
Modified:
trunk/bootstrap/Makefile.am
trunk/configure.ac
Modified: trunk/bootstrap/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/Makefile.am?rev=28958&r1=28957&r2=28958&view=diff
==============================================================================
--- trunk/bootstrap/Makefile.am (original)
+++ trunk/bootstrap/Makefile.am Wed Apr 29 20:49:29 2015
@@ -4,7 +4,8 @@
## versions probably do. We still support versions that do not, so
## it's in the list below.
## It should also install it automatically when running autogen.sh.
-EXTRA_DIST = fcgui.in \
+EXTRA_DIST = freeciv.project \
+ fcgui.in \
fcser.in \
fcruledit.in \
fc_svnrev_gen.h.tmpl \
Added: trunk/bootstrap/freeciv.project
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv.project?rev=28958&view=auto
==============================================================================
--- trunk/bootstrap/freeciv.project (added)
+++ trunk/bootstrap/freeciv.project Wed Apr 29 20:49:29 2015
@@ -0,0 +1 @@
+META_URL="http://meta.freeciv.org/metaserver.php";
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=28958&r1=28957&r2=28958&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Apr 29 20:49:29 2015
@@ -19,7 +19,6 @@
AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated])
AC_DEFINE_UNQUOTED([BUG_URL], ["$BUG_URL"], [Bug reporting 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])
@@ -194,6 +193,15 @@
gtk3_cflags="-DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_8
-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
fi
gtk3_cflags="$gtk3_cflags -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_8
-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
+
+AC_ARG_WITH([project-definition],
+ AS_HELP_STRING([--with-project-definition=file], [use given project
definition file]),
+[project_definition="${withval}"],
+[project_definition="${srcdir}/bootstrap/freeciv.project"])
+
+. ${project_definition}
+
+AC_DEFINE_UNQUOTED([FREECIV_META_URL], ["$META_URL"], [Metaserver URL])
AC_ARG_WITH([readline],
AS_HELP_STRING([--with-readline], [support fancy command line editing]),
@@ -1372,7 +1380,7 @@
LDFLAGS="$EXTRA_DEBUG_LDFLAGS $LDFLAGS"
dnl Rebuild 'configure' whenever fc_version changes, if maintainer mode
enabled.
-AC_SUBST([CONFIGURE_DEPENDENCIES], ["$CONFIGURE_DEPENDENCIES
\$(top_srcdir)/fc_version"])
+AC_SUBST([CONFIGURE_DEPENDENCIES], ["$CONFIGURE_DEPENDENCIES
\$(top_srcdir)/fc_version \${top_builddir}/${project_definition}"])
dnl Make sure that fc_config.h changes when ever CPPFLAGS, CFLAGS or CXXFLAGS
dnl change so everything gets rebuilt. LDFLAGS is not handled here
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
