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

Bugfix in autoconf --with-fribidi

Browse source 
1. --without-fribidi had no effect, now it has.

2. --with-fribidi is now the default (unless fribidi isn't installed).
This commit is contained in:
Oron Peled 2005-12-03 11:07:41 +00:00
parent 1d2493e069
commit b9f357a008
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -194,9 +194,9 @@ AC_ARG_ENABLE([tools],
[tools=no])
AC_ARG_WITH([fribidi],
AS_HELP_STRING([--with-fribidi], [enable Bidirectional language support]),
AS_HELP_STRING([--without-fribidi], [disable Bidirectional language support]),
[fribidi=$withval],
[fribidi=no])
[fribidi=yes])
AC_ARG_WITH([kde],
AS_HELP_STRING([--with-kde], [enable installation of icon and KDE menu entry]),
@ -310,7 +310,7 @@ fi
AC_SUBST([FRIBIDI_CFLAGS])
AC_SUBST([FRIBIDI_LIBS])
AM_CONDITIONAL([FRIBIDI], [test x$fribidifound = xyes])
AM_CONDITIONAL([FRIBIDI], [test "x$fribidifound" = xyes -a "x$fribidi" = xyes ])
# libpng-config

4
src/Makefile.am
View file

@ -27,8 +27,7 @@ noinst_LIBRARIES = libwesnoth-core.a
pkgdatadir=$(datadir)/@DATADIR@
THELIBS = -L. -lwesnoth-core $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
$(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBZIPIOS) $(FREETYPE_LIBS) $(LIBINTL) \
@FRIBIDI_LIBS@
$(SDL_TTF_LIBS) $(SDL_LIBS) $(LIBZIPIOS) $(FREETYPE_LIBS) $(LIBINTL)
#############################################################################
# Wesnoth #
@ -417,6 +416,7 @@ AM_CFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ -DW
if FRIBIDI
AM_CXXFLAGS += -DHAVE_FRIBIDI @FRIBIDI_CFLAGS@
AM_CFLAGS += -DHAVE_FRIBIDI @FRIBIDI_CFLAGS@
THELIBS += @FRIBIDI_LIBS@
endif
if X11