Update of /cvsroot/playerstage/code/stage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26784
Modified Files:
Makefile.am configure.ac stage.pc.in
Log Message:
new directory structure for examples
Index: stage.pc.in
===================================================================
RCS file: /cvsroot/playerstage/code/stage/stage.pc.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** stage.pc.in 20 Sep 2005 00:36:24 -0000 1.6
--- stage.pc.in 28 Jul 2006 22:04:01 -0000 1.7
***************
*** 4,8 ****
Description: Stage robot simulation C library and Player plugin - part of the
Player/Stage Project
Version: @VERSION@
! Requires: gtk+-2.0 >= 2.4 gthread-2.0 >= 2.4 playercore >= 2.0
Libs: -L${prefix}/lib -lstage
Cflags: -I${prefix}/include
--- 4,8 ----
Description: Stage robot simulation C library and Player plugin - part of the
Player/Stage Project
Version: @VERSION@
! Requires: gtk+-2.0 >= 2.4 gthread-2.0 >= 2.4 playercore >= 2.1 playerc >= 2.1
Libs: -L${prefix}/lib -lstage
Cflags: -I${prefix}/include
Index: configure.ac
===================================================================
RCS file: /cvsroot/playerstage/code/stage/configure.ac,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure.ac 5 Jul 2006 22:36:56 -0000 1.14
--- configure.ac 28 Jul 2006 22:04:01 -0000 1.15
***************
*** 88,96 ****
! dnl for ptest, we need libplayerc
! dnl PKG_CHECK_MODULES( PLAYERC, playerc >= 2.0,
! dnl AC_DEFINE(INCLUDE_LIBPLAYERC,1,[building test Player client]),
! dnl AC_MSG_WARN([libplayercr was not found. ])
! dnl )
dnl where's the X11 color database?
--- 88,101 ----
! dnl for libplayerc examples, we need libplayerc
! PKG_CHECK_MODULES( PLAYERC, playerc >= 2.0.1,
! AC_DEFINE(INCLUDE_PLAYERC,1,[building libplayerc examples])
! have_playerc=yes
! ,
! AC_MSG_WARN([libplayerc was not found. ])
! have_playerc=no
! )
!
! AM_CONDITIONAL(HAVE_PLAYERC, [test $have_playerc = yes])
dnl where's the X11 color database?
***************
*** 113,116 ****
--- 118,124 ----
replace/Makefile
src/referees/Makefile
+ examples/Makefile
+ examples/libstage/Makefile
+ examples/libplayerc/Makefile
stage.pc )
***************
*** 129,135 ****
--- 137,155 ----
AC_MSG_RESULT([ compiler: $PLAYER_CFLAGS])
AC_MSG_RESULT([ linker: $PLAYER_LIBS])
+ AC_MSG_RESULT([])
else
AC_MSG_RESULT([Player was not found, so the Stage plugin for Player will
NOT be built.])
AC_MSG_RESULT([If you want the Player/Stage system, you must install Player
and configure Stage again.])
+ AC_MSG_RESULT([])
+ fi
+
+ if test "x$have_playerc" = "xyes"; then
+ AC_MSG_RESULT([libplayerc examples will be built using the following flags:
])
+ dnl AC_MSG_RESULT([ compiler: $PLAYERC_CFLAGS])
+ dnl AC_MSG_RESULT([ linker: $PLAYERC_LIBS])
+ AC_MSG_RESULT([])
+ else
+ AC_MSG_RESULT([libplayerc was not found, so the the examples will NOT be
built.])
+ AC_MSG_RESULT([])
fi
Index: Makefile.am
===================================================================
RCS file: /cvsroot/playerstage/code/stage/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Makefile.am 9 Aug 2005 05:10:26 -0000 1.37
--- Makefile.am 28 Jul 2006 22:04:01 -0000 1.38
***************
*** 1,3 ****
! SUBDIRS = replace src worlds docsrc
# create the pkg-config entries
--- 1,3 ----
! SUBDIRS = replace src worlds docsrc examples
# create the pkg-config entries
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
