From: Oliver O. <fr...@us...> - 2007-07-24 05:03:25
|
Update of /cvsroot/simspark/simspark/spark In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14499 Modified Files: Tag: projectx configure.ac Log Message: changes for new subdirs, version numbers updated (rcssserver3D), MacOS stuff included Index: configure.ac =================================================================== RCS file: /cvsroot/simspark/simspark/spark/configure.ac,v retrieving revision 1.5.2.2.2.1 retrieving revision 1.5.2.2.2.2 diff -C2 -d -r1.5.2.2.2.1 -r1.5.2.2.2.2 *** configure.ac 30 Mar 2007 03:56:17 -0000 1.5.2.2.2.1 --- configure.ac 24 Jul 2007 05:03:21 -0000 1.5.2.2.2.2 *************** *** 1,4 **** # Process this file with autoconf to produce a configure script. ! AC_INIT([simspark], 0.1, [sim...@li...]) AC_CONFIG_SRCDIR([salt/salt.h]) AC_CONFIG_HEADER([sparkconfig.h]) --- 1,4 ---- # Process this file with autoconf to produce a configure script. ! AC_INIT([simspark], 0.1-projectx, [sim...@li...]) AC_CONFIG_SRCDIR([salt/salt.h]) AC_CONFIG_HEADER([sparkconfig.h]) *************** *** 12,18 **** ## Here are the version numbers of our libraries. They should be updated (only) ## immediately before a release of the package. See libtool manual for details. ! RCSS_LIBRARY_VERSION_INFO(salt_version_info,salt_version,'3:0:3') RCSS_LIBRARY_VERSION_INFO(zeitgeist_version_info,zeitgeist_version,'3:1:0') ! RCSS_LIBRARY_VERSION_INFO(oxygen_version_info,oxygen_version,'3:0:1') RCSS_LIBRARY_VERSION_INFO(kerosin_version_info,kerosin_version,'1:0:0') RCSS_LIBRARY_VERSION_INFO(spark_version_info,spark_version,'0:0:0') --- 12,18 ---- ## Here are the version numbers of our libraries. They should be updated (only) ## immediately before a release of the package. See libtool manual for details. ! RCSS_LIBRARY_VERSION_INFO(salt_version_info,salt_version,'3:1:3') RCSS_LIBRARY_VERSION_INFO(zeitgeist_version_info,zeitgeist_version,'3:1:0') ! RCSS_LIBRARY_VERSION_INFO(oxygen_version_info,oxygen_version,'5:1:2') RCSS_LIBRARY_VERSION_INFO(kerosin_version_info,kerosin_version,'1:0:0') RCSS_LIBRARY_VERSION_INFO(spark_version_info,spark_version,'0:0:0') *************** *** 33,37 **** AC_PROG_AWK AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no]) ! AC_CHECK_PROG([PDFLATEX], [pdflatex]) AM_CONDITIONAL(DOXYGEN, test x$DOXYGEN = xyes ) AM_CONDITIONAL(COND_PDFLATEX, test x$PDFLATEX != x) --- 33,37 ---- AC_PROG_AWK AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no]) ! AC_CHECK_PROG([PDFLATEX], [pdflatex], [yes], [no]) AM_CONDITIONAL(DOXYGEN, test x$DOXYGEN = xyes ) AM_CONDITIONAL(COND_PDFLATEX, test x$PDFLATEX != x) *************** *** 131,134 **** --- 131,135 ---- utility/Makefile \ utility/libobj/Makefile \ + utility/ois/Makefile \ utility/sfsexp/Makefile \ utility/rcssnet/Makefile \ *************** *** 147,153 **** --- 148,160 ---- test/coretest/Makefile \ plugin/Makefile \ + plugin/collisionperceptor/Makefile \ plugin/filesystemstd/Makefile \ + plugin/gyrorateperceptor/Makefile \ plugin/sceneeffector/Makefile \ + plugin/inputois/Makefile \ plugin/inputsdl/Makefile \ + plugin/movieff/Makefile \ + plugin/objimporter/Makefile \ + plugin/openglsysogre/Makefile \ plugin/openglsyssdl/Makefile \ plugin/sexpparser/Makefile \ *************** *** 155,163 **** plugin/rosimporter/Makefile \ plugin/sparkmonitor/Makefile \ ! plugin/sparkagent/Makefile ], [test -f salt/salt-config && chmod a+x salt/salt-config && \ test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \ test -f oxygen/oxygen-config && chmod a+x oxygen/oxygen-config && \ test -f kerosin/kerosin-config && chmod a+x kerosin/kerosin-config && \ ! test -f spark/spark-config && chmod +x spark/spark-config ]) AC_OUTPUT --- 162,171 ---- plugin/rosimporter/Makefile \ plugin/sparkmonitor/Makefile \ ! plugin/sparkagent/Makefile \ ! plugin/voidmeshimporter/Makefile ], [test -f salt/salt-config && chmod a+x salt/salt-config && \ test -f zeitgeist/zeitgeist-config && chmod a+x zeitgeist/zeitgeist-config && \ test -f oxygen/oxygen-config && chmod a+x oxygen/oxygen-config && \ test -f kerosin/kerosin-config && chmod a+x kerosin/kerosin-config && \ ! test -f spark/spark-config && chmod +x spark/spark-config]) AC_OUTPUT |