[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth configure configure.ac
|
From: |
Yann Dirson |
|
Subject: |
[Wesnoth-cvs-commits] wesnoth configure configure.ac |
|
Date: |
Thu, 02 Sep 2004 09:59:54 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Yann Dirson <address@hidden> 04/09/02 11:53:41
Modified files:
. : configure configure.ac
Log message:
switch relevant flags from --enable-* to --with-*, make old flags to
cause an error to help with migration, made helpstrings alignment and
capitalisation consistent with standard ones
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.diff?tr1=1.94&tr2=1.95&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.76&tr2=1.77&r1=text&r2=text
Patches:
Index: wesnoth/configure
diff -u wesnoth/configure:1.94 wesnoth/configure:1.95
--- wesnoth/configure:1.94 Thu Sep 2 09:36:11 2004
+++ wesnoth/configure Thu Sep 2 11:53:41 2004
@@ -872,17 +872,15 @@
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-rpath do not hardcode runtime library paths
- --enable-debug Enable debug in wesnoth
- --enable-static Enable static building of wesnoth
- --enable-lite Enable lite version of wesnoth (without music)
- --datadir-name[=dir] Change name of data directory. Default with this
option: wesnoth-data
- --enable-server Enable compilation of server
- --enable-editor Enable compilation of map editor
- --enable-tools Enable compilation of tools for translators and artists
- --enable-kde Enable installation of icon and KDE menu entry
- --enable-gnome Enable installation of icon and GNOME menu entry
- --enable-wzip Enable compilation of wesnoth_zip program
- --disable-sdltest Do not try to compile and run a test SDL program
+ --enable-debug enable debug in wesnoth
+ --enable-static enable static building of wesnoth
+ --enable-lite enable lite version of wesnoth (without music)
+
+ --enable-server enable compilation of server
+ --enable-editor enable compilation of map editor
+ --enable-tools enable compilation of tools for translators and
artists
+ --enable-wzip enable compilation of wesnoth_zip program
+ --disable-sdltest do not try to compile and run a test SDL program
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -893,6 +891,9 @@
--with-included-gettext use the GNU gettext library included here
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and
libdir
+ --with-datadir-name[=dir] change name of data directory. [wesnoth]
+ --with-kde enable installation of icon and KDE menu entry
+ --with-gnome enable installation of icon and GNOME menu entry
--with-x use the X Window System
Some influential environment variables:
@@ -9869,6 +9870,14 @@
# Check whether --enable-datadir-name or --disable-datadir-name was given.
if test "${enable_datadir_name+set}" = set; then
enableval="$enable_datadir_name"
+ { { echo "$as_me:$LINENO: error: Please use --with-datadir-name instead of
obsolete --enable-datadir-name" >&5
+echo "$as_me: error: Please use --with-datadir-name instead of obsolete
--enable-datadir-name" >&2;}
+ { (exit 1); exit 1; }; }
+fi;
+
+# Check whether --with-datadir-name or --without-datadir-name was given.
+if test "${with_datadir_name+set}" = set; then
+ withval="$with_datadir_name"
case "${enableval}" in
yes)
DATADIR="wesnoth-data"
@@ -9910,6 +9919,14 @@
# Check whether --enable-kde or --disable-kde was given.
if test "${enable_kde+set}" = set; then
enableval="$enable_kde"
+ { { echo "$as_me:$LINENO: error: Please use --with-kde instead of obsolete
--enable-kde" >&5
+echo "$as_me: error: Please use --with-kde instead of obsolete --enable-kde"
>&2;}
+ { (exit 1); exit 1; }; }
+fi;
+
+# Check whether --with-kde or --without-kde was given.
+if test "${with_kde+set}" = set; then
+ withval="$with_kde"
kde=$enableval
else
kde=no
@@ -9918,6 +9935,14 @@
# Check whether --enable-gnome or --disable-gnome was given.
if test "${enable_gnome+set}" = set; then
enableval="$enable_gnome"
+ { { echo "$as_me:$LINENO: error: Please use --with-gnome instead of obsolete
--enable-gnome" >&5
+echo "$as_me: error: Please use --with-gnome instead of obsolete
--enable-gnome" >&2;}
+ { (exit 1); exit 1; }; }
+fi;
+
+# Check whether --with-gnome or --without-gnome was given.
+if test "${with_gnome+set}" = set; then
+ withval="$with_gnome"
gnome=$enableval
else
gnome=no
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.76 wesnoth/configure.ac:1.77
--- wesnoth/configure.ac:1.76 Wed Sep 1 19:07:18 2004
+++ wesnoth/configure.ac Thu Sep 2 11:53:41 2004
@@ -10,7 +10,7 @@
dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default
server for this version])
AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default
server for this version])
-AC_REVISION([$Revision: 1.76 $])
+AC_REVISION([$Revision: 1.77 $])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([foreign 1.5])
@@ -25,24 +25,25 @@
#######################################################################
AC_ARG_ENABLE([debug],
- [ --enable-debug Enable debug in wesnoth],
+ [ --enable-debug enable debug in wesnoth],
[if test "x${enableval}" = "xyes" ; then
CXXFLAGS="$CXXFLAGS -DDEBUG -ggdb3"
fi])
AC_ARG_ENABLE([static],
- [ --enable-static Enable static building of wesnoth],
+ [ --enable-static enable static building of wesnoth],
[static=$enableval],
[static=no])
AC_ARG_ENABLE([lite],
- [ --enable-lite Enable lite version of wesnoth (without
music)],
+ [ --enable-lite enable lite version of wesnoth
(without music)],
[lite=$enableval],
[lite=no])
DATADIR=$PACKAGE
-AC_ARG_ENABLE([datadir-name],
- [ --datadir-name[[=dir]] Change name of data directory. Default
with this option: wesnoth-data],
+AC_ARG_ENABLE([datadir-name],,[AC_MSG_ERROR([Please use --with-datadir-name
instead of obsolete --enable-datadir-name])])
+AC_ARG_WITH([datadir-name],
+ [ --with-datadir-name[[=dir]] change name of data directory.
[[wesnoth]]],
[case "${enableval}" in
yes)
DATADIR="wesnoth-data"
@@ -55,34 +56,36 @@
esac])
AC_SUBST([DATADIR])
-
+
AC_ARG_ENABLE([server],
- [ --enable-server Enable compilation of server],
+ [ --enable-server enable compilation of server],
[server=$enableval],
[server=no])
AC_ARG_ENABLE([editor],
- [ --enable-editor Enable compilation of map editor],
+ [ --enable-editor enable compilation of map editor],
[editor=$enableval],
[editor=no])
AC_ARG_ENABLE([tools],
- [ --enable-tools Enable compilation of tools for
translators and artists],
+ [ --enable-tools enable compilation of tools for
translators and artists],
[tools=$enableval],
[tools=no])
-AC_ARG_ENABLE([kde],
- [ --enable-kde Enable installation of icon and KDE menu
entry],
+AC_ARG_ENABLE([kde],,[AC_MSG_ERROR([Please use --with-kde instead of obsolete
--enable-kde])])
+AC_ARG_WITH([kde],
+ [ --with-kde enable installation of icon and KDE
menu entry],
[kde=$enableval],
[kde=no])
-AC_ARG_ENABLE([gnome],
- [ --enable-gnome Enable installation of icon and GNOME
menu entry],
+AC_ARG_ENABLE([gnome],,[AC_MSG_ERROR([Please use --with-gnome instead of
obsolete --enable-gnome])])
+AC_ARG_WITH([gnome],
+ [ --with-gnome enable installation of icon and GNOME
menu entry],
[gnome=$enableval],
[gnome=no])
AC_ARG_ENABLE([wzip],
- [ --enable-wzip Enable compilation of wesnoth_zip
program],
+ [ --enable-wzip enable compilation of wesnoth_zip
program],
[wzip=$enableval],
[wzip=no])
@@ -154,7 +157,7 @@
# Check for SDL version. Taken from sdl.m4
AC_ARG_ENABLE([sdltest],
- [ --disable-sdltest Do not try to compile and run a test
SDL program],
+ [ --disable-sdltest do not try to compile and run a test
SDL program],
,
enable_sdltest=yes)
- [Wesnoth-cvs-commits] wesnoth configure configure.ac,
Yann Dirson <=