0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dammit ! had to underquoted those AC_DEFINE arguments again...

Browse source 
...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
This commit is contained in:
Yann Dirson 2005-04-06 19:18:41 +00:00
parent 3c83e8ba0a
commit 75f00105ae
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
configure.ac
View file

@ -8,11 +8,11 @@ AC_PREREQ([2.57])
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, [davidnwhite@optusnet.com.au], [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 @@ AC_CONFIG_COMMANDS([src/wesconfig.h],
# 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"
@ -246,7 +246,7 @@ dnl Locate X include files and libraries
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 @@ int main(int argc, char **argv)
])],
[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"