upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 20:06:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the boost.m4 way to include the regex library.

Browse Source
This commit is contained in:
Mark de Wever 2008-01-28 17:03:32 +00:00
parent f4c1ed330d
commit b25e007e44
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
INSTALL
View File

@ -9,6 +9,7 @@ You'll need to have these libraries (with equivalent devel versions) to build We
libfreetype2
libz
boost_iostreams >= 1.33.0
boost_regex >= 1.33.0
Recommended (can be deactivated via ./configure --disable-python):
python2.4

1
configure.ac
View File

@ -906,6 +906,7 @@ fi
BOOST_REQUIRE([1.33])
BOOST_IOSTREAMS
BOOST_REGEX
if test "x$tests" = "xyes"; then

4
src/Makefile.am
View File

@ -43,7 +43,7 @@ pkgdatadir=$(datadir)/@DATADIR@
THELIBS = -L. -lwesnoth-core $(SDL_IMAGE_LIBS) $(SDL_MIXER_LIBS) $(SDL_NET_LIBS) \
$(SDL_TTF_LIBS) $(SDL_LIBS) $(PYTHON_LIBS) $(FREETYPE_LIBS) $(LIBINTL) \
$(BOOST_IOSTREAMS_LIBS) -lboost_regex-mt
$(BOOST_IOSTREAMS_LIBS) $(BOOST_REGEX_LIBS)
wesnoth_source = \
about.cpp \
@ -501,7 +501,7 @@ if STATIC
LDFLAGS += -all-static
endif
LDFLAGS += $(BOOST_IOSTREAMS_LDFLAGS) -lboost_regex-mt
LDFLAGS += $(BOOST_IOSTREAMS_LDFLAGS) $(BOOST_REGEX_LDFLAGS)
#if STATIC
#LIBS += -static -L/usr/lib -Wl,-rpath,/usr/lib -L/usr/X11R6/lib -lSDL_image \