Author: cazfi
Date: Thu Aug 13 05:23:05 2015
New Revision: 29483
URL: http://svn.gna.org/viewcvs/freeciv?rev=29483&view=rev
Log:
Replaced configure option --with-freeciv-manual with --enable-freeciv-manual
that can be used also
to control the kind of output freeciv-manual will produce.
See patch #6214
Modified:
branches/S2_6/configure.ac
branches/S2_6/doc/README.packaging
branches/S2_6/tools/civmanual.c
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=29483&r1=29482&r2=29483&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Thu Aug 13 05:23:05 2015
@@ -807,11 +807,20 @@
AM_CONDITIONAL([CLIENT], [test "x$client" = "xyes"])
-AC_ARG_WITH([freeciv-manual],
- AS_HELP_STRING([--without-freeciv-manual], [do not build freeciv-manual]),
- [fcmanual=${withval}], [fcmanual=yes])
-
-AM_CONDITIONAL([FCMANUAL], [test "x$fcmanual" = "xyes"])
+AC_ARG_ENABLE([freeciv-manual],
+ AS_HELP_STRING([--enable-freeciv-manual=no/yes/wiki/html], [build
freeciv-manual [wiki]]),
+[case "${enableval}" in
+ yes|wiki) fcmanual=wiki ;;
+ no) fcmanual=no ;;
+ html) fcmanual=html ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-freeciv-manual]) ;;
+esac], [fcmanual=wiki])
+
+AM_CONDITIONAL([FCMANUAL], [test "x$fcmanual" != "xno"])
+
+if test x$fcmanual = xhtml ; then
+ AC_DEFINE([MANUAL_USE_HTML], [1], [Build freeciv-manual with html
formatting])
+fi
dnl freeciv-modpack checks
AC_ARG_ENABLE([fcmp],
Modified: branches/S2_6/doc/README.packaging
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/README.packaging?rev=29483&r1=29482&r2=29483&view=diff
==============================================================================
--- branches/S2_6/doc/README.packaging (original)
+++ branches/S2_6/doc/README.packaging Thu Aug 13 05:23:05 2015
@@ -41,6 +41,11 @@
SDL1.2-mixer
* Server now saves its readline history to file
"~/.freeciv/freeciv-server_history" instead of "~/.freeciv-server_history"
+* Configure option --with-freeciv-manual / --without-freeciv-manual has
+ been replaced with --enable-freeciv-manual / --disable-freeciv-manual
+ that can take also value --enable-freeciv-manual=html to make
+ freeciv-manual that produces manuals with alternative formatting,
+ default still being wiki formatting.
----------------------------------------------------------------------
Compatibility of modified versions
Modified: branches/S2_6/tools/civmanual.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/civmanual.c?rev=29483&r1=29482&r2=29483&view=diff
==============================================================================
--- branches/S2_6/tools/civmanual.c (original)
+++ branches/S2_6/tools/civmanual.c Thu Aug 13 05:23:05 2015
@@ -80,7 +80,7 @@
};
/* This formats the manual for an HTML wiki. */
-#ifdef USE_HTML
+#ifdef MANUAL_USE_HTML
#define HEADER "<html><head><link rel=\"stylesheet\" type=\"text/css\" "\
"href=\"manual.css\"/><meta http-equiv=\"Content-Type\" "\
"content=\"text/html; charset=UTF-8\"/></head><body>\n\n"
@@ -90,7 +90,7 @@
#define IMAGE_END ".png\">"
#define SEPARATOR " "
#define TAIL "</body></html>"
-#else
+#else /* MANUAL_USE_HTML */
#define HEADER " "
#define SECTION_BEGIN "==="
#define SECTION_END "==="
@@ -98,7 +98,7 @@
#define IMAGE_END ".png]]"
#define SEPARATOR "----\n\n"
#define TAIL " "
-#endif
+#endif /* MANUAL_USE_HTML */
void insert_client_build_info(char *outbuf, size_t outlen);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
