Author: cazfi
Date: Mon May 11 00:22:52 2015
New Revision: 29041
URL: http://svn.gna.org/viewcvs/freeciv?rev=29041&view=rev
Log:
Let the MODPACK_LIST_URL to be defined via project definition file. Obsoleted
--with-modlist
See patch #6056
Modified:
trunk/bootstrap/freeciv.project
trunk/configure.ac
Modified: trunk/bootstrap/freeciv.project
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/bootstrap/freeciv.project?rev=29041&r1=29040&r2=29041&view=diff
==============================================================================
--- trunk/bootstrap/freeciv.project (original)
+++ trunk/bootstrap/freeciv.project Mon May 11 00:22:52 2015
@@ -1 +1,5 @@
META_URL="http://meta.freeciv.org/metaserver.php";
+
+# We want default MODPACK_LIST_URL constructed compile time, so not giving
+# one here. This is just an example.
+# MODPACK_LIST_URL="http://modpack.freeciv.org/${DATASUBDIR}/modpack.list";
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=29041&r1=29040&r2=29041&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon May 11 00:22:52 2015
@@ -203,6 +203,10 @@
AC_DEFINE_UNQUOTED([FREECIV_META_URL], ["$META_URL"], [Metaserver URL])
+if test "x$MODPACK_LIST_URL" != "x" ; then
+ AC_DEFINE_UNQUOTED([MODPACK_LIST_URL], ["${MODPACK_LIST_URL}"], [Default
modpack list URL])
+fi
+
AC_ARG_WITH([readline],
AS_HELP_STRING([--with-readline], [support fancy command line editing]),
WITH_READLINE=$withval, dnl yes/no - required to use / never use
@@ -214,13 +218,6 @@
AS_HELP_STRING([--with-followtag], [version tag to follow]),
[FOLLOWTAG=${withval}])
AC_DEFINE_UNQUOTED([FOLLOWTAG], ["${FOLLOWTAG}"], [Version tag to follow])
-
-AC_ARG_WITH([modlist],
- AS_HELP_STRING([--with-modlist], [default modlist URL]),
-[modlist_url=${withval}])
-if test "x$modlist_url" != "x" ; then
- AC_DEFINE_UNQUOTED([MODPACK_LIST_URL], ["${modlist_url}"], [Default modpack
list URL])
-fi
AC_ARG_WITH([desktopdir],
AS_HELP_STRING([--with-desktopdir], [install desktop files to given dir]),
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
