Menu
▾
▴
[Iaeditor-commits] SF.net SVN: iaeditor: [353] trunk
|
From: <ob...@us...> - 2008-03-25 18:51:29
|
Revision: 353
http://iaeditor.svn.sourceforge.net/iaeditor/?rev=353&view=rev
Author: obi666
Date: 2008-03-25 11:51:36 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Added vc9 msvcgen handling.
Started new cs-independent dynamics library.
Modified Paths:
--------------
trunk/Jamfile.in
trunk/configure
trunk/configure.ac
trunk/mk/autoconf/cel.m4
trunk/mk/autoconf/checkbuild.m4
trunk/mk/autoconf/checkcommon.m4
trunk/mk/autoconf/checklib.m4
trunk/mk/autoconf/checkprog.m4
trunk/mk/autoconf/checkpython.m4
trunk/mk/autoconf/compiler.m4
trunk/mk/autoconf/crystal.m4
trunk/mk/autoconf/emit.m4
trunk/mk/autoconf/packageinfo.m4
trunk/mk/autoconf/warnings.m4
trunk/mk/jam/application.jam
trunk/mk/jam/assembler.jam
trunk/mk/jam/bisonflex.jam
trunk/mk/jam/build.jam
trunk/mk/jam/clean.jam
trunk/mk/jam/compiler.jam
trunk/mk/jam/docs.jam
trunk/mk/jam/dump.jam
trunk/mk/jam/flags.jam
trunk/mk/jam/groups.jam
trunk/mk/jam/help.jam
trunk/mk/jam/helper.jam
trunk/mk/jam/install.jam
trunk/mk/jam/jamcompatibility.jam
trunk/mk/jam/library.jam
trunk/mk/jam/macosx.jam
trunk/mk/jam/msvcgen.jam
trunk/mk/jam/objectivec.jam
trunk/mk/jam/objects.jam
trunk/mk/jam/options.jam
trunk/mk/jam/plugin.jam
trunk/mk/jam/property.jam
trunk/mk/jam/pythmod.jam
trunk/mk/jam/resource.jam
trunk/mk/jam/static.jam
trunk/mk/jam/subdir.jam
trunk/mk/jam/swig.jam
trunk/mk/jam/unittest.jam
trunk/mk/jam/unix.jam
trunk/mk/jam/variant.jam
trunk/mk/jam/win32.jam
trunk/mk/msvcgen/control.tlib
trunk/mk/msvcgen/custom.cslib
trunk/mk/msvcgen/macros.tlib
trunk/mk/msvcgen/project6.tlib
trunk/mk/msvcgen/project7.tlib
trunk/mk/msvcgen/projectx6.tlib
trunk/mk/msvcgen/projectx7.tlib
trunk/mk/msvcgen/workspace6.tlib
trunk/mk/msvcgen/workspace7.tlib
trunk/msvc/7/appiaeditor.vcproj
trunk/msvc/7/grpall_iaeditor.vcproj
trunk/msvc/7/grpapps_iaeditor.vcproj
trunk/msvc/7/grpiaeditorall_iaeditor.vcproj
trunk/msvc/7/grplibs_iaeditor.vcproj
trunk/msvc/7/grpplugins_iaeditor.vcproj
trunk/msvc/7/libpropgrid.vcproj
trunk/msvc/7/plgbehaviourlayer.vcproj
trunk/msvc/7/plgcsobjects.vcproj
trunk/msvc/7/plgforce_script.vcproj
trunk/msvc/7/plgpfcharacter.vcproj
trunk/msvc/7/plgpfguiactor.vcproj
trunk/msvc/7/plgpfobj_properties.vcproj
trunk/msvc/7/plgpfodedynamics.vcproj
trunk/msvc/7/wksiaeditor.sln
trunk/msvc/71/appiaeditor.vcproj
trunk/msvc/71/grpall_iaeditor.vcproj
trunk/msvc/71/grpapps_iaeditor.vcproj
trunk/msvc/71/grpiaeditorall_iaeditor.vcproj
trunk/msvc/71/grplibs_iaeditor.vcproj
trunk/msvc/71/grpplugins_iaeditor.vcproj
trunk/msvc/71/libpropgrid.vcproj
trunk/msvc/71/plgbehaviourlayer.vcproj
trunk/msvc/71/plgcsobjects.vcproj
trunk/msvc/71/plgforce_script.vcproj
trunk/msvc/71/plgpfcharacter.vcproj
trunk/msvc/71/plgpfguiactor.vcproj
trunk/msvc/71/plgpfobj_properties.vcproj
trunk/msvc/71/plgpfodedynamics.vcproj
trunk/msvc/71/wksiaeditor.sln
trunk/msvc/8/appiaeditor.vcproj
trunk/msvc/8/grpall_iaeditor.vcproj
trunk/msvc/8/grpapps_iaeditor.vcproj
trunk/msvc/8/grpiaeditorall_iaeditor.vcproj
trunk/msvc/8/grplibs_iaeditor.vcproj
trunk/msvc/8/grpplugins_iaeditor.vcproj
trunk/msvc/8/libpropgrid.vcproj
trunk/msvc/8/plgbehaviourlayer.vcproj
trunk/msvc/8/plgcsobjects.vcproj
trunk/msvc/8/plgforce_script.vcproj
trunk/msvc/8/plgpfcharacter.vcproj
trunk/msvc/8/plgpfguiactor.vcproj
trunk/msvc/8/plgpfobj_properties.vcproj
trunk/msvc/8/plgpfodedynamics.vcproj
trunk/msvc/8/wksiaeditor.sln
trunk/msvc/appiaeditor.manifest
trunk/msvc/appiaeditor.rc
trunk/msvc/libbehaviourlayer_staticreg.cpp
trunk/msvc/libcsobjects_staticreg.cpp
trunk/msvc/libforce_script_staticreg.cpp
trunk/msvc/libpfcharacter_staticreg.cpp
trunk/msvc/libpfguiactor_staticreg.cpp
trunk/msvc/libpfobj_properties_staticreg.cpp
trunk/msvc/libpfodedynamics_staticreg.cpp
trunk/msvc/plgbehaviourlayer.rc
trunk/msvc/plgcsobjects.rc
trunk/msvc/plgforce_script.rc
trunk/msvc/plgpfcharacter.rc
trunk/msvc/plgpfguiactor.rc
trunk/msvc/plgpfobj_properties.rc
trunk/msvc/plgpfodedynamics.rc
trunk/src/Jamfile
trunk/src/apps/editor/Jamfile
trunk/src/plugins/objproperties/properties.cpp
Added Paths:
-----------
trunk/mk/autoconf/checkstl.m4
trunk/mk/autoconf/visibility.m4
trunk/mk/jam/debuginfo.jam
trunk/mk/jam/pymarshall.jam
trunk/mk/jam/upload.jam
trunk/mk/msvcgen/custom.cellib
trunk/msvc/7/libdynbullet.vcproj
trunk/msvc/71/libdynbullet.vcproj
trunk/msvc/8/libdynbullet.vcproj
trunk/msvc/9/
trunk/msvc/9/appiaeditor.vcproj
trunk/msvc/9/grpall_iaeditor.vcproj
trunk/msvc/9/grpapps_iaeditor.vcproj
trunk/msvc/9/grpiaeditorall_iaeditor.vcproj
trunk/msvc/9/grplibs_iaeditor.vcproj
trunk/msvc/9/grpplugins_iaeditor.vcproj
trunk/msvc/9/libdynbullet.vcproj
trunk/msvc/9/libpropgrid.vcproj
trunk/msvc/9/plgbehaviourlayer.vcproj
trunk/msvc/9/plgcsobjects.vcproj
trunk/msvc/9/plgforce_script.vcproj
trunk/msvc/9/plgpfcharacter.vcproj
trunk/msvc/9/plgpfguiactor.vcproj
trunk/msvc/9/plgpfobj_properties.vcproj
trunk/msvc/9/plgpfodedynamics.vcproj
trunk/msvc/9/wksiaeditor.sln
trunk/src/libs/
trunk/src/libs/Jamfile
trunk/src/libs/dynamics/
trunk/src/libs/dynamics/Jamfile
trunk/src/libs/dynamics/bullet/
trunk/src/libs/dynamics/bullet/Jamfile
trunk/src/libs/dynamics/bullet/dynbullet.cpp
trunk/src/libs/dynamics/bullet/dynbullet.h
Modified: trunk/Jamfile.in
===================================================================
--- trunk/Jamfile.in 2008-03-04 13:52:37 UTC (rev 352)
+++ trunk/Jamfile.in 2008-03-25 18:51:36 UTC (rev 353)
@@ -1,122 +1,129 @@
-TOP ?= "@top_srcdir@" ;
-BUILDTOP ?= "@top_builddir@" ;
-
-SubDir TOP ;
-
-IncludeDir ;
-IncludeDir src ;
-IncludeDir src include ;
-IncludeDir $(BUILDTOP) : : literal transient ;
-
-CleanDir clean :
- out ;
-Clean distclean :
- aclocal.m4
- config.h
- config.h.in~
- config.log
- config.status
- config.status.lineno
- config.cache
- configure.lineno
- Jamconfig
- Jamfile ;
-CleanDir distclean :
- autom4te.cache ;
-Depends distclean : clean ;
-
-Clean maintainerclean :
- config.h.in
- configure ;
-Depends maintainerclean : distclean ;
-
-Help distclean : "Remove built targets and configuration" ;
-Help maintainerclean :
- "Remove built targets, configuration, and generated files." ;
-
-# Set up subdirectories into which the different generated project for
-# different go.
-MsvcGenSubDir TOP msvc : common ;
-MsvcGenSubDir TOP msvc 7 : 7 ;
-MsvcGenSubDir TOP msvc 71 : 71 ;
-MsvcGenSubDir TOP msvc 8 : 8 ;
-MsvcGenTemplateDir TOP mk msvcgen ;
-
-# Customize the build configurations to contain some defines required by
-# CrystalSpace. NOTE: The file with the customization options is assumed
-# to reside in mk/msvcgen/.
-MsvcGenVariable customize : custom.cslib ;
-
-# Set up the workspace we want msvcgen to synthesize.
-MsvcGenWorkspace iaeditor ;
-
-local hash = "\$" ;
-MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
-MsvcGenConfig CRYSTAL.DEFINES ;
-MsvcGenConfig CRYSTAL.CFLAGS ;
-MsvcGenConfig CRYSTAL.LFLAGS ;
-MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
-MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
-MsvcGenConfig CRYSTAL.INCDIRS :
- [ ConcatDirs .. .. .. CS include ]
- [ ConcatDirs .. .. .. CS include csutil win32 ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include ]
- [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS :
- [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
- [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
-
-
-if $(CEL.DESIRED) = yes
-{
- MsvcGenConfig CEL.AVAILABLE : yes ;
- MsvcGenConfig CEL.DEFINES : USE_CEL ;
- MsvcGenConfig CEL.CFLAGS ;
- MsvcGenConfig CEL.LFLAGS ;
- MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
- MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
- MsvcGenConfig CEL.INCDIRS :
- [ ConcatDirs .. .. .. cel include ]
- [ ConcatDirs "$(hash)(CEL)" include ]
- [ ConcatDirs "$(hash)(CEL)" include cel ] ;
- MsvcGenConfig CEL.LIBDIRS :
- [ ConcatDirs .. .. .. cel out release libs ]
- [ ConcatDirs "$(hash)(CEL)" out release libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
- MsvcGenConfig CEL.LIBDIRS.DEBUG :
- [ ConcatDirs .. .. .. cel out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" out debug libs ]
- [ ConcatDirs "$(hash)(CEL)" libs ] ;
-}
-
-MsvcGenConfig WX.AVAILABLE : yes ;
-MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
-MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
-MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
-MsvcGenConfig WX.CFLAGS : "" ;
-MsvcGenConfig WX.LFLAGS : "" ;
-MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
-
-# Set project-specific compiler and linker options for msvcgen.
-#MsvcDefine MY_DEFINE : "my value" ;
-#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
-#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
-#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
-#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
-#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
-#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
-#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
-#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
-#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
-
-Description iaeditorall : "IAEditor and related plugins" ;
-RegisterCompileGroups iaeditorall ;
-
-SubInclude TOP src ;
+TOP ?= "@top_srcdir@" ;
+BUILDTOP ?= "@top_builddir@" ;
+
+SubDir TOP ;
+
+IncludeDir ;
+IncludeDir src ;
+IncludeDir src include ;
+IncludeDir $(BUILDTOP) : : literal transient ;
+
+CleanDir clean :
+ out ;
+Clean distclean :
+ aclocal.m4
+ config.h
+ config.h.in~
+ config.log
+ config.status
+ config.status.lineno
+ config.cache
+ configure.lineno
+ Jamconfig
+ Jamfile ;
+CleanDir distclean :
+ autom4te.cache ;
+Depends distclean : clean ;
+
+Clean maintainerclean :
+ config.h.in
+ configure ;
+Depends maintainerclean : distclean ;
+
+Help distclean : "Remove built targets and configuration" ;
+Help maintainerclean :
+ "Remove built targets, configuration, and generated files." ;
+
+# Set up subdirectories into which the different generated project for
+# different go.
+MsvcGenSubDir TOP msvc : common ;
+MsvcGenSubDir TOP msvc 7 : 7 ;
+MsvcGenSubDir TOP msvc 71 : 71 ;
+MsvcGenSubDir TOP msvc 8 : 8 ;
+MsvcGenSubDir TOP msvc 9 : 9 ;
+MsvcGenTemplateDir TOP mk msvcgen ;
+
+# Customize the build configurations to contain some defines required by
+# CrystalSpace. NOTE: The file with the customization options is assumed
+# to reside in mk/msvcgen/.
+MsvcGenVariable customize : custom.cslib ;
+
+# Set up the workspace we want msvcgen to synthesize.
+MsvcGenWorkspace iaeditor ;
+
+local hash = "\$" ;
+MsvcGenConfig CRYSTAL.AVAILABLE : yes ;
+MsvcGenConfig CRYSTAL.DEFINES ;
+MsvcGenConfig CRYSTAL.CFLAGS ;
+MsvcGenConfig CRYSTAL.LFLAGS ;
+MsvcGenConfig CRYSTAL.LIBS : "libcrystalspace.lib" ;
+MsvcGenConfig CRYSTAL.LIBS.DEBUG : "libcrystalspace_d.lib" ;
+MsvcGenConfig CRYSTAL.INCDIRS :
+ [ ConcatDirs .. .. .. CS include ]
+ [ ConcatDirs .. .. .. CS include csutil win32 ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" include ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" include csutil win32 ] ;
+MsvcGenConfig CRYSTAL.LIBDIRS :
+ [ ConcatDirs .. .. .. CS out release$(MSVC_VERSION) libs ]
+ [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" out release$(MSVC_VERSION) libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+MsvcGenConfig CRYSTAL.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. .. CS out debug$(MSVC_VERSION) libs ]
+ [ ConcatDirs .. .. .. CS libs csutil win32 libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" out debug$(MSVC_VERSION) libs ]
+ [ ConcatDirs "$(hash)(CRYSTAL)" libs csutil win32 libs ] ;
+
+
+if $(CEL.DESIRED) = yes
+{
+ MsvcGenConfig CEL.AVAILABLE : yes ;
+ MsvcGenConfig CEL.DEFINES : USE_CEL ;
+ MsvcGenConfig CEL.CFLAGS ;
+ MsvcGenConfig CEL.LFLAGS ;
+ MsvcGenConfig CEL.LIBS : "libceltool.lib" ;
+ MsvcGenConfig CEL.LIBS.DEBUG : "libceltool_d.lib" ;
+ MsvcGenConfig CEL.INCDIRS :
+ [ ConcatDirs .. .. .. cel include ]
+ [ ConcatDirs "$(hash)(CEL)" include ]
+ [ ConcatDirs "$(hash)(CEL)" include cel ] ;
+ MsvcGenConfig CEL.LIBDIRS :
+ [ ConcatDirs .. .. .. cel out release libs ]
+ [ ConcatDirs "$(hash)(CEL)" out release libs ]
+ [ ConcatDirs "$(hash)(CEL)" libs ] ;
+ MsvcGenConfig CEL.LIBDIRS.DEBUG :
+ [ ConcatDirs .. .. .. cel out debug libs ]
+ [ ConcatDirs "$(hash)(CEL)" out debug libs ]
+ [ ConcatDirs "$(hash)(CEL)" libs ] ;
+}
+
+MsvcGenConfig WX.AVAILABLE : yes ;
+MsvcGenConfig WX.DEFINES : "wxUSE_GUI=1 WXUSINGDLL=1" ;
+MsvcGenConfig WX.LIBS : "wxbase28.lib wxmsw28_core.lib wxmsw28_gl.lib opengl32.lib wxmsw28_aui.lib" ;
+MsvcGenConfig WX.DEFINES.DEBUG : "wxUSE_GUI=1; WXUSINGDLL=1; WXDEBUG=1;" ;
+MsvcGenConfig WX.CFLAGS : "" ;
+MsvcGenConfig WX.LFLAGS : "" ;
+MsvcGenConfig WX.LIBS.DEBUG : "wxbase28d.lib wxmsw28d_core.lib wxmsw28d_gl.lib opengl32.lib wxmsw28d_aui.lib" ;
+
+MsvcGenConfig BULLET.AVAILABLE : yes ;
+MsvcGenConfig BULLET.LIBS : "bulletcollision-vc8.lib" ;
+MsvcGenConfig BULLET.CFLAGS : "" ;
+MsvcGenConfig BULLET.LFLAGS : "" ;
+MsvcGenConfig WX.LIBS.DEBUG : "bulletcollision-vc8_d.lib" ;
+
+# Set project-specific compiler and linker options for msvcgen.
+#MsvcDefine MY_DEFINE : "my value" ;
+#MsvcDefine MY_RELEASE_DEFINE : "my release value" : release ;
+#MsvcDefine MY_DEBUG_DEFINE : "my debug value" : debug ;
+#MsvcCFlags : "/I \"my\\inc\\path\"" : release ;
+#MsvcCFlags : "/I \"my\\debuginc\\path\"" : debug ;
+#MsvcLFlags : "/libpath:\"my\\lib\\path\"" : release ;
+#MsvcLFlags : "/libpath:\"my\\debuglib\\path\"" : debug ;
+#MsvcGenConfig SUPERCOOL.AVAILABLE : yes ;
+#MsvcGenConfig SUPERCOOL.LIBS : supercool.lib ;
+#MsvcGenConfig SUPERCOOL.LIBS.DEBUG : supercooldebug.lib ;
+
+Description iaeditorall : "IAEditor and related plugins" ;
+RegisterCompileGroups iaeditorall ;
+
+SubInclude TOP src ;
Modified: trunk/configure
===================================================================
--- trunk/configure 2008-03-04 13:52:37 UTC (rev 352)
+++ trunk/configure 2008-03-25 18:51:36 UTC (rev 353)
@@ -705,6 +705,10 @@
CPP
GREP
EGREP
+CONFIG_BULLET
+ac_ct_CONFIG_BULLET
+CONFIG_BULLETDYNAMICS
+ac_ct_CONFIG_BULLETDYNAMICS
CONFIG_WX
ac_ct_CONFIG_WX
CRYSTAL
@@ -1309,6 +1313,8 @@
--enable-as-needed Utilize --as-needed linker flag, if supported by
linker and if the used binutils version is recent
enough to support it properly (default YES)
+ --enable-gc-sections Utilize --gc-sections linker flag for some targets
+ (default YES)
--enable-cstest verify that the Crystal Space SDK is actually usable
(default YES)
--enable-celtest verify that the CEL SDK is actually usable (default
@@ -1336,12 +1342,15 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-cppunit=dir specify location of libcppunit if not detected
- automatically; searches dir/include, dir/lib, and
- dir
- --with-wx=dir specify location of libwx if not detected
- automatically; searches dir/include, dir/lib, and
- dir
+ --with-cppunit=dir specify additional location to search libcppunit if
+ not detected automatically; directories searched
+ include dir/include, dir/lib, and dir
+ --with-bullet=dir specify additional location to search libbullet if
+ not detected automatically; directories searched
+ include dir/include, dir/lib, and dir
+ --with-wx=dir specify additional location to search libwx if not
+ detected automatically; directories searched include
+ dir/include, dir/lib, and dir
--without-cs do not look for an installed Crystal Space SDK; this
option is useful only if you need to perform routine
maintenance tasks, such as generating project files
@@ -1358,9 +1367,9 @@
--with-cel-prefix=CEL_PREFIX
specify location of CEL installation; this is the
\$prefix value used when installing the SDK
- --with-bfd=dir specify location of libbfd if not detected
- automatically; searches dir/include, dir/lib, and
- dir
+ --with-bfd=dir specify additional location to search libbfd if not
+ detected automatically; directories searched include
+ dir/include, dir/lib, and dir
Some influential environment variables:
CC C compiler command
@@ -2874,7 +2883,27 @@
"
fi
+ if test "$ac_compiler_gnu" = yes; then
+ cs_compiler_name_c=GCC
+else
+ cs_compiler_name_c=`echo "$CC" | $as_tr_cpp`
+fi
+ cs_build_prop_val="$cs_compiler_name_c"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C.TYPE ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+ cs_build_prop_val="$cs_compiler_name_c"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.TYPE = \"$cs_build_prop_val\" ;
+"
+fi
+
+
# Check if compiler recognizes -pipe directive.
{ echo "$as_me:$LINENO: checking if $CC accepts -pipe" >&5
echo $ECHO_N "checking if $CC accepts -pipe... $ECHO_C" >&6; }
@@ -3423,7 +3452,6 @@
"
fi
-
cs_build_prop_val="$CPPFLAGS $CXXFLAGS"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -3431,7 +3459,27 @@
"
fi
+ if test "$ac_compiler_gnu" = yes; then
+ cs_compiler_name_cxx=GCC
+else
+ cs_compiler_name_cxx=`echo "$CXX" | $as_tr_cpp`
+fi
+ cs_build_prop_val="$cs_compiler_name_cxx"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C++.TYPE ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+ cs_build_prop_val="$cs_compiler_name_cxx"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.TYPE = \"$cs_build_prop_val\" ;
+"
+fi
+
+
# Check if compiler can be instructed to produce position-independent-code
# (PIC). This feature is required by some platforms when building plugin
# modules and shared libraries.
@@ -3769,7 +3817,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -4145,6 +4193,125 @@
fi
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in ld
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$LD"; then
+ ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+ { echo "$as_me:$LINENO: result: $LD" >&5
+echo "${ECHO_T}$LD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$LD" && break
+ done
+fi
+if test -z "$LD"; then
+ ac_ct_LD=$LD
+ for ac_prog in ld
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_LD"; then
+ ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_LD="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_LD=$ac_cv_prog_ac_ct_LD
+if test -n "$ac_ct_LD"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
+echo "${ECHO_T}$ac_ct_LD" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_LD" && break
+done
+
+ if test "x$ac_ct_LD" = x; then
+ LD=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ LD=$ac_ct_LD
+ fi
+fi
+
+ cs_build_prop_val="$LD"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CMD.LD ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+
cs_build_prop_val="$LDFLAGS"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -5062,7 +5229,181 @@
fi
+ # Check if linker supports --gc-sections.
+ # Check whether --enable-gc-sections was given.
+if test "${enable_gc_sections+set}" = set; then
+ enableval=$enable_gc_sections;
+fi
+ if test -z "$enable_gc_sections"; then
+ enable_gc_sections=yes
+fi
+
+ if test "$enable_gc_sections" != "no"; then
+ { echo "$as_me:$LINENO: checking if --gc-sections is supported" >&5
+echo $ECHO_N "checking if --gc-sections is supported... $ECHO_C" >&6; }
+if test "${cs_cv_prog_link_gc_sections_ok+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ cs_cflags_save="$CXXFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @-Wl,--gc-sections@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CXXFLAGS="$cs_cflags_test $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ cs_build_ok=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
+fi
+
+ done
+
+
+ CXXFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_link_gc_sections=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_link_gc_sections_ok="$cs_cv_prog_link_gc_sections"
+else
+ cs_cv_prog_link_gc_sections=''
+ cs_cv_prog_link_gc_sections_ok=no
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_gc_sections_ok" >&5
+echo "${ECHO_T}$cs_cv_prog_link_gc_sections_ok" >&6; }
+ if test "$cs_cv_prog_link_gc_sections_ok" != no; then
+ cs_build_prop_val="$cs_cv_prog_link_gc_sections"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}LINK.GC_SECTIONS ?= \"$cs_build_prop_val\" ;
+"
+fi
+
+fi
+
+fi
+
+
+
# The default RANLIB in Jambase is wrong on some platforms, and is also
# unsuitable during cross-compilation, so we set the value unconditionally
# (sixth argument of CS_EMIT_BUILD_PROPERTY).
@@ -5173,7 +5514,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5292,7 +5633,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5349,7 +5690,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5468,7 +5809,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5525,7 +5866,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5582,7 +5923,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5639,7 +5980,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5696,7 +6037,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5753,7 +6094,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5813,7 +6154,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5831,7 +6172,7 @@
ac_cv_prog_LIBTOOL_TEST="$LIBTOOL_TEST" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5875,7 +6216,7 @@
ac_cv_prog_ac_ct_LIBTOOL_TEST="$ac_ct_LIBTOOL_TEST" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5925,7 +6266,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -5942,7 +6283,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /sw/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5990,7 +6331,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6114,7 +6455,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6131,7 +6472,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6321,7 +6662,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6378,7 +6719,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6446,7 +6787,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6511,7 +6852,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6876,7 +7217,8 @@
fi
if test "$with_cppunit" != no; then
- # If --with-cppunit value is same as cached value, then assume other
+
+ # If --with-cppunit value is same as cached value, then assume other
# cached values are also valid; otherwise, ignore all cached values.
if test "$with_cppunit" != "$cs_cv_with_cppunit"; then
cs_ignore_cache=yes
@@ -6885,13 +7227,23 @@
fi
+ # Put relevant subdirs of the library directory into PATH and PKGCONFIG
+ PATH_SAVE="$PATH"
+ if test $with_cppunit != yes; then
+ PATH="$with_cppunit/bin$PATH_SEPARATOR$PATH"
+ PKG_CONFIG_PATH_SAVE_1="$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="$with_cppunit$PATH_SEPARATOR$with_cppunit/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH
+fi
+
+
cs_check_lib_flags=''
- if test $with_cppunit = yes; then
- if test "$cs_prog_pkg_config_checked" != yes; then
+ if test "$cs_prog_pkg_config_checked" != yes; then
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -6999,8 +7351,6 @@
fi
fi
- PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
- export PKG_CONFIG_PATH
cs_prog_pkg_config_checked=yes
fi
@@ -7057,7 +7407,7 @@
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
- PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin"
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
export PATH
fi
@@ -7197,9 +7547,7 @@
fi
-fi
-
if test $with_cppunit != yes; then
cs_check_lib_paths=$with_cppunit
else
@@ -7626,6 +7974,14 @@
fi
+
+ PATH="$PATH_SAVE"
+ if test $with_cppunit != yes; then
+ PKG_CONFIG_PATH="$PKG_CONFIG_PATH_SAVE_1"
+ export PKG_CONFIG_PATH
+fi
+
+
else
cs_cv_libcppunit=no
fi
@@ -9293,6 +9649,1251 @@
#------------------------------------------------------------------------------
+# Check for bullet physics library.
+#------------------------------------------------------------------------------
+# Note: The pkg-config package name for Bullet 2.x is 'bullet', but the actual
+# libraries are bulletdynamics, bulletcollision and bulletmath. So note that
+# there is actually no 'bullet' library.
+
+# Check whether --with-bullet was given.
+if test "${with_bullet+set}" = set; then
+ withval=$with_bullet;
+fi
+
+
+ # Backward compatibility: Recognize --with-libbullet as alias for --with-bullet.
+ if test -n "$with_libbullet" &&
+ test -z "$with_bullet"; then
+ with_bullet="$with_libbullet"
+fi
+
+
+ if test -z "$with_bullet"; then
+ with_bullet=yes
+fi
+
+ if test "$with_bullet" != no; then
+
+ # If --with-bullet value is same as cached value, then assume other
+ # cached values are also valid; otherwise, ignore all cached values.
+ if test "$with_bullet" != "$cs_cv_with_bullet"; then
+ cs_ignore_cache=yes
+else
+ cs_ignore_cache=no
+fi
+
+
+ # Put relevant subdirs of the library directory into PATH and PKGCONFIG
+ PATH_SAVE="$PATH"
+ if test $with_bullet != yes; then
+ PATH="$with_bullet/bin$PATH_SEPARATOR$PATH"
+ PKG_CONFIG_PATH_SAVE_1="$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="/usr/local/lib/pkgconfig$PATH_SEPARATOR/sw/lib/pkgconfig$PATH_SEPARATOR/opt/local/lib/pkgconfig$PATH_SEPARATOR/opt/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ PKG_CONFIG_PATH="$with_bullet$PATH_SEPARATOR$with_bullet/lib/pkgconfig$PATH_SEPARATOR$PKG_CONFIG_PATH"
+ export PKG_CONFIG_PATH
+fi
+
+
+ cs_check_lib_flags=''
+ if test "$cs_prog_pkg_config_checked" != yes; then
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in pkg-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$PKG_CONFIG" && break
+ done
+fi
+if test -z "$PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ for ac_prog in pkg-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_PKG_CONFIG" && break
+done
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+fi
+
+ cs_prog_pkg_config_checked=yes
+fi
+
+ if test -z "$cs_cv_prog_pkg_config_ok"; then
+ if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --atleast-pkgconfig-version=0.9.0; then
+ cs_cv_prog_pkg_config_ok=yes
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_pkg_config_ok = yes; then
+ { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes bullet" >&5
+echo $ECHO_N "checking if $PKG_CONFIG recognizes bullet... $ECHO_C" >&6; }
+if test "${cs_cv_prog_pkg_config_bullet+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if $PKG_CONFIG --exists bullet; then
+ cs_cv_prog_pkg_config_bullet=yes
+else
+ cs_cv_prog_pkg_config_bullet=no
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_bullet" >&5
+echo "${ECHO_T}$cs_cv_prog_pkg_config_bullet" >&6; }
+ if test $cs_cv_prog_pkg_config_bullet = yes; then
+ if test -z "$cs_cv_prog_pkg_config_bullet_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags bullet") >&5
+ ($PKG_CONFIG --cflags bullet) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs bullet") >&5
+ ($PKG_CONFIG --libs bullet) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_pkg_config_bullet_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_pkg_config_bullet_flags"
+fi
+
+fi
+
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in bullet-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CONFIG_BULLET+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CONFIG_BULLET"; then
+ ac_cv_prog_CONFIG_BULLET="$CONFIG_BULLET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CONFIG_BULLET="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CONFIG_BULLET=$ac_cv_prog_CONFIG_BULLET
+if test -n "$CONFIG_BULLET"; then
+ { echo "$as_me:$LINENO: result: $CONFIG_BULLET" >&5
+echo "${ECHO_T}$CONFIG_BULLET" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CONFIG_BULLET" && break
+ done
+fi
+if test -z "$CONFIG_BULLET"; then
+ ac_ct_CONFIG_BULLET=$CONFIG_BULLET
+ for ac_prog in bullet-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CONFIG_BULLET+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CONFIG_BULLET"; then
+ ac_cv_prog_ac_ct_CONFIG_BULLET="$ac_ct_CONFIG_BULLET" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CONFIG_BULLET="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CONFIG_BULLET=$ac_cv_prog_ac_ct_CONFIG_BULLET
+if test -n "$ac_ct_CONFIG_BULLET"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_BULLET" >&5
+echo "${ECHO_T}$ac_ct_CONFIG_BULLET" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CONFIG_BULLET" && break
+done
+
+ if test "x$ac_ct_CONFIG_BULLET" = x; then
+ CONFIG_BULLET=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CONFIG_BULLET=$ac_ct_CONFIG_BULLET
+ fi
+fi
+
+ if test -n "$CONFIG_BULLET"; then
+ if test -z "$cs_cv_prog_config_bullet_ok"; then
+ if $CONFIG_BULLET --cflags --libs >/dev/null 2>&1; then
+ cs_cv_prog_config_bullet_ok=yes
+else
+ cs_cv_prog_config_bullet_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_config_bullet_ok = yes; then
+ if test -z "$cs_cv_prog_config_bullet_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLET --cflags ") >&5
+ ($CONFIG_BULLET --cflags ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLET --libs ") >&5
+ ($CONFIG_BULLET --libs ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_config_bullet_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_config_bullet_flags"
+fi
+
+fi
+
+ if test "$cs_prog_pkg_config_checked" != yes; then
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in pkg-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$PKG_CONFIG" && break
+ done
+fi
+if test -z "$PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ for ac_prog in pkg-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_PKG_CONFIG" && break
+done
+
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
+ fi
+fi
+
+ cs_prog_pkg_config_checked=yes
+fi
+
+ if test -z "$cs_cv_prog_pkg_config_ok"; then
+ if test -n "$PKG_CONFIG"; then
+ if $PKG_CONFIG --atleast-pkgconfig-version=0.9.0; then
+ cs_cv_prog_pkg_config_ok=yes
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+else
+ cs_cv_prog_pkg_config_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_pkg_config_ok = yes; then
+ { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes bulletdynamics" >&5
+echo $ECHO_N "checking if $PKG_CONFIG recognizes bulletdynamics... $ECHO_C" >&6; }
+if test "${cs_cv_prog_pkg_config_bulletdynamics+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if $PKG_CONFIG --exists bulletdynamics; then
+ cs_cv_prog_pkg_config_bulletdynamics=yes
+else
+ cs_cv_prog_pkg_config_bulletdynamics=no
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_bulletdynamics" >&5
+echo "${ECHO_T}$cs_cv_prog_pkg_config_bulletdynamics" >&6; }
+ if test $cs_cv_prog_pkg_config_bulletdynamics = yes; then
+ if test -z "$cs_cv_prog_pkg_config_bulletdynamics_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags bulletdynamics") >&5
+ ($PKG_CONFIG --cflags bulletdynamics) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs bulletdynamics") >&5
+ ($PKG_CONFIG --libs bulletdynamics) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_pkg_config_bulletdynamics_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_pkg_config_bulletdynamics_flags"
+fi
+
+fi
+
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in bulletdynamics-config
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_CONFIG_BULLETDYNAMICS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$CONFIG_BULLETDYNAMICS"; then
+ ac_cv_prog_CONFIG_BULLETDYNAMICS="$CONFIG_BULLETDYNAMICS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CONFIG_BULLETDYNAMICS="$ac_tool_prefix$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+CONFIG_BULLETDYNAMICS=$ac_cv_prog_CONFIG_BULLETDYNAMICS
+if test -n "$CONFIG_BULLETDYNAMICS"; then
+ { echo "$as_me:$LINENO: result: $CONFIG_BULLETDYNAMICS" >&5
+echo "${ECHO_T}$CONFIG_BULLETDYNAMICS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$CONFIG_BULLETDYNAMICS" && break
+ done
+fi
+if test -z "$CONFIG_BULLETDYNAMICS"; then
+ ac_ct_CONFIG_BULLETDYNAMICS=$CONFIG_BULLETDYNAMICS
+ for ac_prog in bulletdynamics-config
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_CONFIG_BULLETDYNAMICS"; then
+ ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS="$ac_ct_CONFIG_BULLETDYNAMICS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CONFIG_BULLETDYNAMICS=$ac_cv_prog_ac_ct_CONFIG_BULLETDYNAMICS
+if test -n "$ac_ct_CONFIG_BULLETDYNAMICS"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_BULLETDYNAMICS" >&5
+echo "${ECHO_T}$ac_ct_CONFIG_BULLETDYNAMICS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$ac_ct_CONFIG_BULLETDYNAMICS" && break
+done
+
+ if test "x$ac_ct_CONFIG_BULLETDYNAMICS" = x; then
+ CONFIG_BULLETDYNAMICS=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to aut...@gn...." >&2;}
+ac_tool_warned=yes ;;
+esac
+ CONFIG_BULLETDYNAMICS=$ac_ct_CONFIG_BULLETDYNAMICS
+ fi
+fi
+
+ if test -n "$CONFIG_BULLETDYNAMICS"; then
+ if test -z "$cs_cv_prog_config_bulletdynamics_ok"; then
+ if $CONFIG_BULLETDYNAMICS --cflags --libs >/dev/null 2>&1; then
+ cs_cv_prog_config_bulletdynamics_ok=yes
+else
+ cs_cv_prog_config_bulletdynamics_ok=no
+fi
+
+fi
+
+ if test $cs_cv_prog_config_bulletdynamics_ok = yes; then
+ if test -z "$cs_cv_prog_config_bulletdynamics_flags"; then
+ cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLETDYNAMICS --cflags ") >&5
+ ($CONFIG_BULLETDYNAMICS --cflags ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_check_lib_lflag=''
+ cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_BULLETDYNAMICS --libs ") >&5
+ ($CONFIG_BULLETDYNAMICS --libs ) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_config_bulletdynamics_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags $cs_cv_prog_config_bulletdynamics_flags"
+fi
+
+fi
+
+
+
+ if test $with_bullet != yes; then
+ cs_check_lib_paths=$with_bullet
+else
+ cs_check_lib_paths="| /usr/local/include|/usr/local/lib \
+ /sw/include|/sw/lib \
+ /opt/local/include|/opt/local/lib \
+ /opt/include|/opt/lib "
+fi
+
+ for cs_lib_item in $cs_check_lib_paths
+ do
+ case $cs_lib_item in
+ *\|*)
+ set filler `echo "$cs_lib_item" | awk 'BEGIN { FS="|" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_check_incdir=''
+else
+ if test "$1" = filler; then
+ cs_check_incdir=''
+else
+ cs_check_incdir=$1
+fi
+
+ shift
+fi
+if test $# -eq 0; then
+ cs_check_libdir=''
+else
+ if test "$1" = filler; then
+ cs_check_libdir=''
+else
+ cs_check_libdir=$1
+fi
+
+ shift
+fi
+
+ if test -n "$cs_check_incdir"; then
+ cs_check_lib_cflag="-I$cs_check_incdir"
+else
+ cs_check_lib_cflag=''
+fi
+
+ if test -n "$cs_check_libdir"; then
+ cs_check_lib_lflag="-L$cs_check_libdir"
+else
+ cs_check_lib_lflag=''
+fi
+
+ if test -n "bullet"; then
+ cs_check_lib_libs="-lbullet"
+ cs_check_lib_framework="-framework bullet"
+else
+ cs_check_lib_libs=''
+ cs_check_lib_framework=''
+fi
+
+ cs_check_lib_flags="$cs_check_lib_flags
+ `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_framework | sed 'y% %#%'`
+ `echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'...
[truncated message content] |
