[Wesnoth-cvs-commits] wesnoth configure.ac

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/04/06 19:18:41

Modified files:
        .              : configure.ac 

Log message:
        dammit !  had to underquoted those AC_DEFINE arguments again so that 
autoheader works !  use a workaround for the expansion bug, by changing the 
name of the m4 macro to be different from the cpp one

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.134&tr2=1.135&r1=text&r2=text

Patches:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.134 wesnoth/configure.ac:1.135
--- wesnoth/configure.ac:1.134  Wed Apr  6 19:13:03 2005
+++ wesnoth/configure.ac        Wed Apr  6 19:18:41 2005
@@ -8,11 +8,11 @@
 
 define([WESNOTH_VERSION],[0.8.11+cvs])
 
-dnl define([WESNOTH_DEFAULT_SERVER],[server.wesnoth.org])
-define([WESNOTH_DEFAULT_SERVER],[devsrv.wesnoth.org])
+dnl define([DEFAULT_SERVER],[server.wesnoth.org])
+define([DEFAULT_SERVER],[devsrv.wesnoth.org])
 
 AC_INIT([Battle for Wesnoth], WESNOTH_VERSION, address@hidden, [wesnoth])
-AC_DEFINE([[WESNOTH_DEFAULT_SERVER]], ["]WESNOTH_DEFAULT_SERVER["], [The 
default server for this version])
+AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["]DEFAULT_SERVER["], [The default server 
for this version])
 
 dnl
 dnl Generate wesconfig.h from the information above
@@ -26,7 +26,7 @@
 # include "config.h"
 #else
 # define VERSION "]WESNOTH_VERSION["
-# define WESNOTH_DEFAULT_SERVER "]WESNOTH_DEFAULT_SERVER["
+# define WESNOTH_DEFAULT_SERVER "]DEFAULT_SERVER["
 # define PACKAGE "wesnoth"
 # ifndef LOCALEDIR
 #  define LOCALEDIR "translations"
@@ -37,7 +37,7 @@
 EOF
 ])
 
-AC_REVISION([$Revision: 1.134 $])
+AC_REVISION([$Revision: 1.135 $])
 
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_SRCDIR([src/actions.cpp])
@@ -246,7 +246,7 @@
 
    AC_CHECK_LIB(X11, XOpenDisplay, have_libx11='yes',have_libx11='no',$X_LIBS)
    if test "$have_libx11" != 'no'; then
-     AC_DEFINE([[HAVE_LIBX11]],,[Define if you have X11 libraries])
+     AC_DEFINE([HAVE_LIBX11],,[Define if you have X11 libraries])
      X_LIBS="$NEW_LIBS"
      CPPFLAGS="$X_CFLAGS $CPPFLAGS"
      LIBS="$X_LIBS $LIBS"
@@ -568,7 +568,7 @@
        ])],
        [AC_MSG_RESULT(yes)
        LIBZIPIOS="-lzipios -lz"
-       AC_DEFINE([[USE_ZIPIOS]],[1],[Make use of the zipios++ library to read 
data in zip files])],
+       AC_DEFINE([USE_ZIPIOS],[1],[Make use of the zipios++ library to read 
data in zip files])],
        [AC_MSG_RESULT(no)
        AC_MSG_WARN([*** libzipios++ not found - support for ZIP files is 
disabled])])
 LIBS="$OLD_LIBS"