--- vegastrike-0.4.3/configure.in~ 2006-06-14 01:05:35.000000000 +0200
+++ vegastrike-0.4.3/configure.in 2006-06-14 01:10:42.000000000 +0200
@@ -1596,15 +1596,15 @@
AC_SUBST(CG_CPPFLAGS)
AC_SUBST(CG_LIBS)
-BOOST_CPPFLAGS="-DUSE_BOOST_128=1"' -I$(top_srcdir)/src/boost'
-BOOST_LIBS="../src/boost/libpython_boost.a"
+BOOST_CPPFLAGS="-DUSE_BOOST_128=1"
+BOOST_LIBS="-lpython_boost"
TESTUSEBOOST131="1"
TESTUSEBOOST128="0"
AC_ARG_ENABLE(boost-128, AC_HELP_STRING([--enable-boost-128], [Use if your compiler has trouble with boost-131 (such as gcc 2.9x)]),TESTUSEBOOST131="0")
if test "$TESTUSEBOOST131" = "1" ; then
- BOOST_CPPFLAGS="-DUSE_BOOST_131=1 "'-I$(top_srcdir)/src/boost129'
- BOOST_LIBS="../src/boost129/libpython_boost.a"
+ BOOST_CPPFLAGS="-DUSE_BOOST_131=1"
+ BOOST_LIBS="-lpython_boost"
fi
if test "$TESTUSEBOOST131" = "0" ; then
@@ -1650,10 +1650,6 @@
objconv/Makefile
src/Makefile
src/aldrv/Makefile
- src/boost/Makefile
- src/boost129/Makefile
- src/boost129/converter/Makefile
- src/boost129/object/Makefile
src/cmd/Makefile
src/cmd/ai/Makefile
src/cmd/collide/Makefile
--- vegastrike-0.4.3/src/Makefile.am~ 2004-10-12 22:18:53.000000000 +0200
+++ vegastrike-0.4.3/src/Makefile.am 2006-06-14 01:09:01.000000000 +0200
@@ -2,7 +2,7 @@
bin_PROGRAMS = vegastrike vegaserver accountserver
SUBDIRS = \
- cmd gfx gldrv aldrv python gui networking boost common boost129
+ cmd gfx gldrv aldrv python gui networking common
vegastrike_LDADD = \
networking/netserver_devices.o \
@@ -21,8 +21,7 @@
gui/libgui.a \
networking/libnet.a \
cmd/collide/libcollide.a \
-boost129/libboost_python.a \
-boost/libboost_python.a \
+-lboost_python \
gfx/nav/libnav.a \
aldrv/libaldrv.a \
-lz
@@ -43,8 +42,7 @@
gfx/libgfxserver.a \
gldrv/libgldrvserver.a \
cmd/collide/libcollide.a \
-boost129/libboost_python.a \
-boost/libboost_python.a \
+-lboost_python \
-lz
accountserver_LDADD = \