Menu
▾
▴
[Rccparser-commits] CVS: rcclient acinclude.m4,1.2,1.3 configure.ac,1.4,1.5
|
From: Tom H. <tom...@us...> - 2004-07-08 02:16:56
|
Update of /cvsroot/rccparser/rcclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12925 Modified Files: acinclude.m4 configure.ac Log Message: 2003-01-10 Tom Howard <tom...@us...> * ./configure.ac Released rcclient-0.0.1 Index: acinclude.m4 =================================================================== RCS file: /cvsroot/rccparser/rcclient/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** acinclude.m4 10 Jan 2003 18:56:47 -0000 1.2 --- acinclude.m4 8 Jul 2004 02:16:46 -0000 1.3 *************** *** 15,21 **** }], [AS_VAR_SET(ac_lib_rccparser, yes)], ! [AS_VAR_SET(ac_lib_rccparser, no) ! LDFLAGS="$OLD_LDFLAGS" ! ]) AC_LANG_POP(C++) ]) --- 15,20 ---- }], [AS_VAR_SET(ac_lib_rccparser, yes)], ! [AS_VAR_SET(ac_lib_rccparser, no)]) ! LDFLAGS="$OLD_LDFLAGS" AC_LANG_POP(C++) ]) *************** *** 39,45 **** }], [AS_VAR_SET(ac_lib_rcssnet, yes)], ! [AS_VAR_SET(ac_lib_rcssnet, no) ! LDFLAGS="$OLD_LDFLAGS" ! ]) AC_LANG_POP(C++) ]) --- 38,43 ---- }], [AS_VAR_SET(ac_lib_rcssnet, yes)], ! [AS_VAR_SET(ac_lib_rcssnet, no)]) ! LDFLAGS="$OLD_LDFLAGS" AC_LANG_POP(C++) ]) *************** *** 47,48 **** --- 45,209 ---- AS_VAR_POPDEF([ac_lib_rcssnet])dnl ])# AC_LIB_RCSSNET + # AC_LIB_RCSSCONFPARSER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcssconfparser library + AC_DEFUN([AC_LIB_RCSSCONFPARSER], + [AS_VAR_PUSHDEF([ac_lib_rcssconfparser], [ac_cv_lib_rcssconfparser])dnl + AC_CACHE_CHECK(whether the rcssconfparser library is available, ac_cv_lib_rcssconfparser, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcssconfparser" + AC_LINK_IFELSE([@%:@include <rcssbase/conf/builder.hpp> + @%:@include <rcssbase/conf/parser.hpp> + int main() + { + rcss::conf::Builder builder( "test" ); + rcss::conf::Parser parser( builder ); + return 0; + }], + [AS_VAR_SET(ac_lib_rcssconfparser, yes)], + [AS_VAR_SET(ac_lib_rcssconfparser, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcssconfparser) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcssconfparser])dnl + ])# AC_LIB_RCSSCONFPARSER + # AC_LIB_RCSSBASE([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcssbase library + AC_DEFUN([AC_LIB_RCSSBASE], + [AS_VAR_PUSHDEF([ac_lib_rcssbase], [ac_cv_lib_rcssbase])dnl + AC_CACHE_CHECK(whether the rcssbase library is available, ac_cv_lib_rcssbase, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcssbase" + AC_LINK_IFELSE([@%:@include <rcssbase/version.hpp> + int main() + { + rcss::base::version(); + return 0; + }], + [AS_VAR_SET(ac_lib_rcssbase, yes)], + [AS_VAR_SET(ac_lib_rcssbase, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcssbase) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcssbase])dnl + ])# AC_LIB_RCSSBASE + # AC_LIB_RCSSLIB([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcsslib library + AC_DEFUN([AC_LIB_RCSSLIB], + [AS_VAR_PUSHDEF([ac_lib_rcsslib], [ac_cv_lib_rcsslib])dnl + AC_CACHE_CHECK(whether the rcsslib library is available, ac_cv_lib_rcsslib, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcsslib" + AC_LINK_IFELSE([@%:@include <rcssbase/lib/loader.hpp> + int main() + { + rcss::lib::Loader::libsLoaded(); + return 0; + }], + [AS_VAR_SET(ac_lib_rcsslib, yes)], + [AS_VAR_SET(ac_lib_rcsslib, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcsslib) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcsslib])dnl + ])# AC_LIB_RCSSLIB + # AC_LIB_RCSSGZ([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcssgz library + AC_DEFUN([AC_LIB_RCSSGZ], + [AS_VAR_PUSHDEF([ac_lib_rcssgz], [ac_cv_lib_rcssgz])dnl + AC_CACHE_CHECK(whether the rcssgz library is available, ac_cv_lib_rcssgz, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcssgz" + AC_LINK_IFELSE([@%:@include <rcssbase/gz/gzstream.hpp> + int main() + { + rcss::gz::gzostream strm( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rcssgz, yes)], + [AS_VAR_SET(ac_lib_rcssgz, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcssgz) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcssgz])dnl + ])# AC_LIB_RCSSGZ + # AC_LIB_RCCOFFLINECOACHSERIALIZER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rccofflinecoachserializer library + AC_DEFUN([AC_LIB_RCCOFFLINECOACHSERIALIZER], + [AS_VAR_PUSHDEF([ac_lib_rccofflinecoachserializer], [ac_cv_lib_rccofflinecoachserializer])dnl + AC_CACHE_CHECK(whether the rccofflinecoachserializer library is available, ac_cv_lib_rccofflinecoachserializer, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrccofflinecoachserializer" + AC_LINK_IFELSE([@%:@include <rccserializer/rccofflinecoachserializer.h> + int main() + { + rcc::OfflineCoachSerializer ser( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rccofflinecoachserializer, yes)], + [AS_VAR_SET(ac_lib_rccofflinecoachserializer, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rccofflinecoachserializer) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rccofflinecoachserializer])dnl + ])# AC_LIB_RCCOFFLINECOACHSERIALIZER + # AC_LIB_RCCONLINECOACHSERIALIZER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rcconlinecoachserializer library + AC_DEFUN([AC_LIB_RCCONLINECOACHSERIALIZER], + [AS_VAR_PUSHDEF([ac_lib_rcconlinecoachserializer], [ac_cv_lib_rcconlinecoachserializer])dnl + AC_CACHE_CHECK(whether the rcconlinecoachserializer library is available, ac_cv_lib_rcconlinecoachserializer, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrcconlinecoachserializer" + AC_LINK_IFELSE([@%:@include <rccserializer/rcconlinecoachserializer.h> + int main() + { + rcc::OnlineCoachSerializer ser( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rcconlinecoachserializer, yes)], + [AS_VAR_SET(ac_lib_rcconlinecoachserializer, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rcconlinecoachserializer) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rcconlinecoachserializer])dnl + ])# AC_LIB_RCCONLINECOACHSERIALIZER + # AC_LIB_RCCPLAYERSERIALIZER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) + # --------------------------------------------------------- + # Checks for the rccplayerserializer library + AC_DEFUN([AC_LIB_RCCPLAYERSERIALIZER], + [AS_VAR_PUSHDEF([ac_lib_rccplayerserializer], [ac_cv_lib_rccplayerserializer])dnl + AC_CACHE_CHECK(whether the rccplayerserializer library is available, ac_cv_lib_rccplayerserializer, + [AC_LANG_PUSH(C++) + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lrccplayerserializer" + AC_LINK_IFELSE([@%:@include <rccserializer/rccplayerserializer.h> + int main() + { + rcc::PlayerSerializer ser( std::cout ); + return 0; + }], + [AS_VAR_SET(ac_lib_rccplayerserializer, yes)], + [AS_VAR_SET(ac_lib_rccplayerserializer, no)]) + LDFLAGS="$OLD_LDFLAGS" + AC_LANG_POP(C++) + ]) + AS_IF([test AS_VAR_GET(ac_lib_rccplayerserializer) = yes], [$1], [$2]) + AS_VAR_POPDEF([ac_lib_rccplayerserializer])dnl + ])# AC_LIB_RCCPLAYERSERIALIZER Index: configure.ac =================================================================== RCS file: /cvsroot/rccparser/rcclient/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.ac 10 Jan 2003 19:00:37 -0000 1.4 --- configure.ac 8 Jul 2004 02:16:46 -0000 1.5 *************** *** 18,21 **** --- 18,35 ---- AC_CHECK_LIB(z, deflate) + AC_ARG_VAR(RCCPARSER, [The prefix that was used when installing rccparser]) + if test "$RCCPARSER"; then + if test -z "$LDFLAGS"; then + LDFLAGS="-L$RCCPARSER/lib" + else + LDFLAGS="$LDFLAGS -L$RCCARSER/lib" + fi + if test -z "$CPPFLAGS"; then + CPPFLAGS="-I$RCCPARSER/include" + else + CPPFLAGS="$CPPFLAGS -I$RCCPARSER/include" + fi + fi + AC_LIB_RCCPARSER([], [ AC_MSG_ERROR([Could not find the rccparser library or it's headers *************** *** 25,47 **** command line arguments.])]) ! dnl Checks for header files. ! AC_LIB_RCSSNET([], [ ! AC_MSG_ERROR([Could not find the rcsoccersim/rcssbase files or they ! are out of date. Please (re)install rcsoccersim/rcssbase before ! proceeding or specify the path to the rccbase headers by adding ! 'CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.]) ! ]) ! AC_CHECK_HEADER([rcssbase/gzstream.h], [], [ ! AC_MSG_ERROR([Could not find the rcsoccersim/rcssbase files or they ! are out of date. Please (re)install rcsoccersim/rcssbase before ! proceeding or specify the path to the rccbase headers by adding ! 'CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.]) ! ]) dnl Checks for typedefs, structures, and compiler characteristics. --- 39,115 ---- command line arguments.])]) + AC_ARG_VAR(RCCSERIALIZER, [The prefix that was used when installing rccserializer]) + if test "$RCCSERIALIZER"; then + if test -z "$LDFLAGS"; then + LDFLAGS="-L$RCCSERIALIZER/lib" + else + LDFLAGS="$LDFLAGS -L$RCCARSER/lib" + fi + if test -z "$CPPFLAGS"; then + CPPFLAGS="-I$RCCSERIALIZER/include" + else + CPPFLAGS="$CPPFLAGS -I$RCCSERIALIZER/include" + fi + fi ! AC_LIB_RCCOFFLINECOACHSERIALIZER([].[ ! AC_MSG_ERROR([Could not find the rccserializer library or it's headers ! or it is out of date. Please (re)install rccparser or specify the ! path to the rccparser library by adding 'LDFLAGS=\"-L<LIBDIR> ! CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.])]) ! AC_LIB_RCCONLINECOACHSERIALIZER([].[ ! AC_MSG_ERROR([Could not find the rccserializer library or it's headers ! or it is out of date. Please (re)install rccparser or specify the ! path to the rccparser library by adding 'LDFLAGS=\"-L<LIBDIR> ! CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.])]) ! AC_LIB_RCCPLAYERSERIALIZER([].[ ! AC_MSG_ERROR([Could not find the rccserializer library or it's headers ! or it is out of date. Please (re)install rccparser or specify the ! path to the rccparser library by adding 'LDFLAGS=\"-L<LIBDIR> ! CXXFLAGS=\"-I<INCLUDEDIR> <YOUR_OTHER_FLAGS>\"' to configure's ! command line arguments.])]) ! dnl Checks for header files. ! AC_ARG_VAR(RCSSBASE, [The prefix that was used when installing rcssbase]) ! if test "$RCSSBASE"; then ! if test -z "$PATH"; then ! PATH="$RCSSBASE/bin" ! else ! PATH="$PATH:$RCSSBASE/bin" ! fi ! if test -z "$LDFLAGS"; then ! LDFLAGS="-L$RCSSBASE/lib" ! else ! LDFLAGS="$LDFLAGS -L$RCSSBASE/lib" ! fi ! if test -z "$CPPFLAGS"; then ! CPPFLAGS="-I$RCSSBASE/include" ! else ! CPPFLAGS="$CPPFLAGS -I$RCSSBASE/include" ! fi ! fi + AC_LIB_RCSSNET([], + [AC_MSG_ERROR([ + Could not find the rcssbase/net library or it is out of + date. Please (re)install rcssbase before proceeding, or + specify where it was installed with the RCSSBASE + environment variable. + ])]) + AC_LIB_RCSSGZ([], [AC_MSG_ERROR([ + Could not find the rcssbase/gz library or it is out of + date. Please (re)install rcssbase before proceeding, or + specify where it was installed with the RCSSBASE + environment variable. + ])]) + AC_LIB_RCSSBASE([],[AC_MSG_ERROR([ + Could not find the rcssbase library or it is out of + date. Please (re)install rcssbase before proceeding, or + specify where it was installed with the RCSSBASE + environment variable. + ])]) dnl Checks for typedefs, structures, and compiler characteristics. *************** *** 49,65 **** AC_C_INLINE - dnl Checks for library functions. - - - - - dnl optional features - - dnl test for debug mode - - DO_DEBUG=`echo "$CXXFLAGS" | $AWK '/-g/ { print "true" }'` - if test "$DO_DEBUG" == "true"; then - CXXFLAGS="$CXXFLAGS -DDEBUG"; - fi --- 117,120 ---- |
