From: <eg...@us...> - 2007-09-21 12:45:45
|
Revision: 753 http://opengate.svn.sourceforge.net/opengate/?rev=753&view=rev Author: egore Date: 2007-09-21 05:45:47 -0700 (Fri, 21 Sep 2007) Log Message: ----------- Improve autotools a bit further Modified Paths: -------------- branches/ogsector/TODO.cbrill branches/ogsector/configure.ac Modified: branches/ogsector/TODO.cbrill =================================================================== --- branches/ogsector/TODO.cbrill 2007-09-21 09:33:21 UTC (rev 752) +++ branches/ogsector/TODO.cbrill 2007-09-21 12:45:47 UTC (rev 753) @@ -3,3 +3,4 @@ * remove ogre dependency from server * remove ois dependency from server * remove testopenalmanager once the client is done +* fix "make dist" with ogreopcode external stuff Modified: branches/ogsector/configure.ac =================================================================== --- branches/ogsector/configure.ac 2007-09-21 09:33:21 UTC (rev 752) +++ branches/ogsector/configure.ac 2007-09-21 12:45:47 UTC (rev 753) @@ -16,14 +16,13 @@ AC_HEADER_STDC AM_PROG_CC_C_O +# TODO: remove this part OGSECTOR_PATH=$PWD - AC_PREFIX_DEFAULT($OGSECTOR_PATH) - OGSECTOR_EXTERNALS_PATH=$OGSECTOR_PATH/externals AC_SUBST(OGSECTOR_EXTERNALS_PATH) - AC_SUBST(PKG_CONFIG_PATH, "$OGSECTOR_EXTERNALS_PATH/lib/pkgconfig:$PKG_CONFIG_PATH") +# TODO: end remove AM_PROG_LIBTOOL @@ -55,7 +54,19 @@ AC_SUBST(vorbisfile_CFLAGS) AC_SUBST(vorbisfile_LIBS) -dnl asio: http://sourceforge.net/projects/asio/ +AC_CHECK_LIB([boost_regex], + [main], + , + [AC_MSG_ERROR([*** boost_regex library not found!])] +) + +AC_CHECK_LIB([boost_thread], + [main], + , + [AC_MSG_ERROR([*** boost_thread library not found!])] +) + +# TODO: fix this part AC_CHECK_HEADER([asio.hpp],, [ echo "Can't find asio headers. Please install the asio development packages." @@ -63,16 +74,11 @@ exit 1 ],[]) -dnl boost: http://www.boost.org/ -dnl # some of the boost headers are needed by asio -#AC_CHECK_HEADER([boost/bind.h]) - -AC_SUBST(AM_LDFLAGS, "$AM_LDFLAGS -lboost_thread -lboost_regex") - AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/include"]) AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/include"]) AC_SUBST([CXXFLAGS], ["${CXXFLAGS} -I$OGSECTOR_EXTERNALS_PATH/ogreopcode/opcode132"]) AC_SUBST([LDFLAGS], ["${LDFLAGS} -L$OGSECTOR_EXTERNALS_PATH/lib/ -lOpcode -lOgreOpcode"]) +# TODO: end fix AC_OUTPUT([ Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |