--- ode-0.7/ode/src/Makefile.am.library_fixes 2007-01-21 21:49:54.000000000 +0100
+++ ode-0.7/ode/src/Makefile.am 2007-01-21 21:50:51.000000000 +0100
@@ -4,14 +4,12 @@ AM_CFLAGS = @ARCHFLAGS@ -I$(top_srcdir)/
lib_LIBRARIES = libode.a
libode_a_CPPFLAGS = -O2
-if X86_64_SYSTEM
libode_a_CPPFLAGS += -fPIC
-endif
# Fake an executable in order to get a shared library
# Note the elegant and cunning way to trick Autotools to install a program
# in a lib directory. --Rodrigo
-traplibdir=$(prefix)/lib
+traplibdir=$(libdir)
EXEEXT=@so_ext@
traplib_PROGRAMS=libode
libode_SOURCES=
@@ -31,9 +29,7 @@ noinst_LIBRARIES= libfast.a
libfast_a_CFLAGS= -O1
libfast_a_SOURCES= fastldlt.c fastltsolve.c fastdot.c fastlsolve.c
-if X86_64_SYSTEM
libfast_a_CFLAGS += -fPIC
-endif
libode_a_DEPENDENCIES = libfast.a
libode_a_LIBADD= $(libfast_a_OBJECTS)
@@ -96,9 +92,7 @@ if OPCODE
noinst_LIBRARIES+= libOPCODE.a
libOPCODE_a_CPPFLAGS= -O2 -fno-strict-aliasing -fPIC
-if X86_64_SYSTEM
libOPCODE_a_CPPFLAGS += -fPIC
-endif
libOPCODE_a_SOURCES= @TOPDIR@/OPCODE/OPC_AABBCollider.cpp \
@TOPDIR@/OPCODE/OPC_AABBTree.cpp \
--- ode-0.7/ode/src/Makefile.in.library_fixes 2007-01-21 21:49:54.000000000 +0100
+++ ode-0.7/ode/src/Makefile.in 2007-01-21 21:51:12.000000000 +0100
@@ -39,14 +39,14 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
LIBOBJDIR =
-@X86_64_SYSTEM_TRUE@am__append_1 = -fPIC
+am__append_1 = -fPIC
traplib_PROGRAMS = libode$(EXEEXT)
@USE_SONAME_TRUE@am__append_2 = -Wl,-soname,@ODE_SONAME@
@OPCODE_TRUE@am__append_3 = libOPCODE.a
@OPCODE_TRUE@am__append_4 = $(libOPCODE_a_OBJECTS)
-@X86_64_SYSTEM_TRUE@am__append_5 = -fPIC
+am__append_5 = -fPIC
@OPCODE_TRUE@am__append_6 = libOPCODE.a
-@OPCODE_TRUE@@X86_64_SYSTEM_TRUE@am__append_7 = -fPIC
+@OPCODE_TRUE@am__append_7 = -fPIC
@OPCODE_TRUE@am__append_8 = libOPCODE.a
@OPCODE_TRUE@am__append_9 = $(libOPCODE_a_OBJECTS)
@OPCODE_TRUE@am__append_10 = -I@TOPDIR@/OPCODE -I@TOPDIR@/OPCODE/Ice -DdTRIMESH_ENABLED
@@ -444,7 +444,7 @@ libode_a_CPPFLAGS = -O2 $(am__append_1)
# Fake an executable in order to get a shared library
# Note the elegant and cunning way to trick Autotools to install a program
# in a lib directory. --Rodrigo
-traplibdir = $(prefix)/lib
+traplibdir = $(libdir)
libode_SOURCES =
libode_DEPENDENCIES = libfast.a libode.a $(am__append_3)
libode_LDFLAGS = @SHARED_LDFLAGS@ $(am__append_2)
--- ode-0.7/Makefile.am.library_fixes 2007-01-21 21:49:54.000000000 +0100
+++ ode-0.7/Makefile.am 2007-01-21 21:50:07.000000000 +0100
@@ -20,13 +20,12 @@ dist-zip: ${PACKAGE}-${VERSION}.tar.gz
if USE_SONAME
install-exec-hook:
- ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
- $(prefix)/lib/libode.so
- ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
- $(prefix)/lib/@ODE_SONAME@
- ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
- $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@
- /sbin/ldconfig
+ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+ $(libdir)/libode.so
+ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+ $(libdir)/@ODE_SONAME@
+ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+ $(libdir)/@ODE_SONAME@.@ODE_REVISION@
else
install-exec-hook:
endif
--- ode-0.7/Makefile.in.library_fixes 2007-01-21 21:49:54.000000000 +0100
+++ ode-0.7/Makefile.in 2007-01-21 21:50:07.000000000 +0100
@@ -646,13 +646,12 @@ dist-zip: ${PACKAGE}-${VERSION}.tar.gz
rm -rf ${PACKAGE}-${VERSION}
@USE_SONAME_TRUE@install-exec-hook:
-@USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
-@USE_SONAME_TRUE@ $(prefix)/lib/libode.so
-@USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
-@USE_SONAME_TRUE@ $(prefix)/lib/@ODE_SONAME@
-@USE_SONAME_TRUE@ ln -s $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
-@USE_SONAME_TRUE@ $(prefix)/lib/@ODE_SONAME@.@ODE_REVISION@
-@USE_SONAME_TRUE@ /sbin/ldconfig
+@USE_SONAME_TRUE@ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+@USE_SONAME_TRUE@ $(libdir)/libode.so
+@USE_SONAME_TRUE@ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+@USE_SONAME_TRUE@ $(libdir)/@ODE_SONAME@
+@USE_SONAME_TRUE@ ln -s @ODE_SONAME@.@ODE_REVISION@.@ODE_AGE@ \
+@USE_SONAME_TRUE@ $(libdir)/@ODE_SONAME@.@ODE_REVISION@
@USE_SONAME_FALSE@install-exec-hook:
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- ode-0.7/configure.in~ 2006-08-17 19:24:09.000000000 +0200
+++ ode-0.7/configure.in 2007-01-21 22:01:09.000000000 +0100
@@ -271,9 +271,9 @@ AC_ARG_ENABLE(release,AC_HELP_STRING([--
release=$enableval,release=no)
if test "x$release" == xyes
then
- CFLAGS="-fomit-frame-pointer -ffast-math"
- CPPFLAGS="-fomit-frame-pointer -ffast-math"
- CXXFLAGS="-fomit-frame-pointer -ffast-math"
+ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math"
+ CPPFLAGS="$CPPFLAGS -fomit-frame-pointer -ffast-math"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math"
AC_DEFINE(dNODEBUG,,[Disable debug output])
fi
AC_MSG_RESULT($release)
@@ -284,9 +284,9 @@ AC_ARG_ENABLE(debug,AC_HELP_STRING([--en
debug=$enableval,debug=no)
if test "x$debug" == xyes
then
- CFLAGS="-g"
- CPPFLAGS="-g"
- CXXFLAGS="-g"
+ CFLAGS="$CFLAGS -g"
+ CPPFLAGS="$CPPFLAGS -g"
+ CXXFLAGS="$CXXFLAGS -g"
fi
AC_MSG_RESULT($debug)
--- ode-0.7/configure~ 2006-09-09 03:34:06.000000000 +0200
+++ ode-0.7/configure 2007-01-21 22:02:10.000000000 +0100
@@ -7265,9 +7265,9 @@ else
fi;
if test "x$release" == xyes
then
- CFLAGS="-fomit-frame-pointer -ffast-math"
- CPPFLAGS="-fomit-frame-pointer -ffast-math"
- CXXFLAGS="-fomit-frame-pointer -ffast-math"
+ CFLAGS="$CFLAGS -fomit-frame-pointer -ffast-math"
+ CPPFLAGS="$CPPFLAGS -fomit-frame-pointer -ffast-math"
+ CXXFLAGS="$CXXFLAGS -fomit-frame-pointer -ffast-math"
cat >>confdefs.h <<\_ACEOF
#define dNODEBUG
