From aac0500c5f77c8cecfe5aaf337bccc4e38494866 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Sun, 25 Apr 2010 13:17:25 +0200 Subject: [PATCH] * integrate the bullet configure.ac file in the hkl3d one --- autogen.sh | 1 - hkl3d/bullet/configure.ac => configure.ac | 264 ++++++++++++++++-------------- hkl3d/bullet/Makefile.am | 2 +- hkl3d/bullet/bullet.pc.in | 11 -- 4 files changed, 145 insertions(+), 133 deletions(-) rename hkl3d/bullet/configure.ac => configure.ac (70%) delete mode 100644 hkl3d/bullet/bullet.pc.in diff --git a/autogen.sh b/autogen.sh index 70cb058..a56b811 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,4 @@ #!/bin/sh mkdir m4 -mkdir -p hkl3d/bullet/m4 autoreconf -ivf diff --git a/hkl3d/bullet/configure.ac b/configure.ac similarity index 70% rename from hkl3d/bullet/configure.ac rename to configure.ac index d173f91..9f558b5 100644 --- a/hkl3d/bullet/configure.ac +++ b/configure.ac @@ -1,120 +1,144 @@ -#---------------------------------------------------------------------------- -# Autoconf input script. Invoke the ./autogen.sh script to generate a -# configure script from this file. -#---------------------------------------------------------------------------- -AC_PREREQ([2.54]) - -#---------------------------------------------------------------------------- -# Initialize Autoconf. -#---------------------------------------------------------------------------- -AC_INIT( - [bullet], - [2.76], - [bullet@erwincoumans.com]) -AC_CANONICAL_HOST -AC_CONFIG_SRCDIR([configure.ac]) -AM_INIT_AUTOMAKE -AM_PROG_CC_C_O -AC_PROG_CXX -AC_PROG_LIBTOOL - -case "$host" in - *-*-mingw*|*-*-cygwin*) - AC_DEFINE(PLATFORM_WIN32, 1, [Platform is Win32]) - opengl_LIBS="-lunsupported_platform" - PLATFORM_STRING="Win32" - ;; - *-*-linux*) - AC_DEFINE(PLATFORM_LINUX, 1, [Platform is Linux]) - opengl_LIBS="-lGL -lGLU -lglut" - PLATFORM_STRING="Linux" - ;; - *-*-darwin*) - AC_DEFINE(PLATFORM_APPLE, 1, [Platform is Apple]) - opengl_LIBS="-framework AGL -framework OpenGL -framework GLUT" - PLATFORM_STRING="Apple" - ;; - *) - AC_MSG_WARN([*** Please add $host to configure.ac checks!]) - ;; -esac -AC_SUBST(opengl_LIBS) - -case "$host" in - i?86-* | k?-* | athlon-* | pentium*-) - AC_DEFINE(ARCH_X86, 1, [Architecture is x86]) - ARCH_SPECIFIC_CFLAGS="" - ARCH_STRING="X86" - ;; - x86_64-*) - AC_DEFINE(ARCH_X86_64, 1, [Architecture is x86-64]) - ARCH_SPECIFIC_CFLAGS="-DUSE_ADDR64" - ARCH_STRING="X86-64" - ;; - ppc-* | powerpc-*) - AC_DEFINE(ARCH_PPC, 1, [Architecture is PowerPC]) - ARCH_SPECIFIC_CFLAGS="" - ARCH_STRING="PowerPC" - ;; - *) - AC_MSG_ERROR([Unknown Architecture]) - ;; -esac -AC_C_BIGENDIAN - - -#---------------------------------------------------------------------------- -# Setup for the configuration header. -#---------------------------------------------------------------------------- -AC_CONFIG_HEADERS([config.h]) -#---------------------------------------------------------------------------- -# Package configuration switches. -#---------------------------------------------------------------------------- -AC_ARG_ENABLE([multithreaded], - [AC_HELP_STRING([--enable-multithreaded], - [build BulletMultiThreaded (default NO)])], - [disable_multithreaded=no], [disable_multithreaded=yes]) -AC_MSG_CHECKING([BulletMultiThreaded]) -AS_IF([test "$disable_multithreaded" = yes], [build_multithreaded=no], [build_multithreaded=yes]) -AC_MSG_RESULT([$build_multithreaded]) -AM_CONDITIONAL([CONDITIONAL_BUILD_MULTITHREADED], [test "$build_multithreaded" = yes]) - -AC_ARG_ENABLE([demos], - [AS_HELP_STRING([--disable-demos], - [disable Bullet demos])], - [], - [enable_demos=yes]) -AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false]) -if test "x$enable_demos" != xno; then - AC_MSG_NOTICE([Building Bullet demos]) - AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS],[true]) -fi - - - -AC_ARG_ENABLE([debug], - [AC_HELP_STRING([--enable-debug], - [build with debugging information (default NO)])], - [], [enable_debug=no]) - -AC_MSG_CHECKING([build mode]) -AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize]) -AC_MSG_RESULT([$build_mode]) - -CFLAGS="$ARCH_SPECIFIC_CFLAGS $CFLAGS" -CXXFLAGS="$ARCH_SPECIFIC_CFLAGS $CXXFLAGS $CFLAGS" -#---------------------------------------------------------------------------- -# Emit generated files. -#---------------------------------------------------------------------------- -AC_CONFIG_FILES([ - Makefile - src/Makefile -]) - -AC_OUTPUT - -AC_MSG_NOTICE([ -You can type 'make' alternatively, you can use cmake ( http://cmake.org )or use the visual studio solution msvc folder. - -Please type 'make' to build Bullet -]) +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.59) +AC_INIT([hkl3d],[0.0.1],[picca@synchrotron-soleil.fr]) +AC_CONFIG_SRCDIR([config.h.in]) +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR(config) + +AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + +# Checks for programs. +AC_PROG_CXX +AC_PROG_AWK +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET +AC_PROG_LIBTOOL + +# Checks for libraries. +AM_PROG_CC_C_O + +# Checks for header files. +AC_HEADER_STDC +AC_HEADER_TIME +AC_CHECK_HEADERS([float.h stdlib.h string.h sys/time.h]) + +# Check for packages +PKG_CHECK_MODULES([HKL], [hkl >= 4.0.0]) +PKG_CHECK_MODULES([G3D], [libg3d >= 0.0.8]) +PKG_CHECK_MODULES([GLU], [glu >= 7.7.1]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_CONST +AC_C_INLINE +AC_TYPE_SIZE_T + +# Checks for library functions. +AC_FUNC_MALLOC +AC_FUNC_REALLOC +AC_FUNC_VPRINTF +AC_CHECK_FUNCS([floor gettimeofday memmove memset sqrt strdup]) + +### took from the bullet configure script +AC_CANONICAL_HOST +case "$host" in + *-*-mingw*|*-*-cygwin*) + AC_DEFINE(PLATFORM_WIN32, 1, [Platform is Win32]) + opengl_LIBS="-lunsupported_platform" + PLATFORM_STRING="Win32" + ;; + *-*-linux*) + AC_DEFINE(PLATFORM_LINUX, 1, [Platform is Linux]) + opengl_LIBS="-lGL -lGLU -lglut" + PLATFORM_STRING="Linux" + ;; + *-*-darwin*) + AC_DEFINE(PLATFORM_APPLE, 1, [Platform is Apple]) + opengl_LIBS="-framework AGL -framework OpenGL -framework GLUT" + PLATFORM_STRING="Apple" + ;; + *) + AC_MSG_WARN([*** Please add $host to configure.ac checks!]) + ;; +esac +AC_SUBST(opengl_LIBS) + +case "$host" in + i?86-* | k?-* | athlon-* | pentium*-) + AC_DEFINE(ARCH_X86, 1, [Architecture is x86]) + ARCH_SPECIFIC_CFLAGS="" + ARCH_STRING="X86" + ;; + x86_64-*) + AC_DEFINE(ARCH_X86_64, 1, [Architecture is x86-64]) + ARCH_SPECIFIC_CFLAGS="-DUSE_ADDR64" + ARCH_STRING="X86-64" + ;; + ppc-* | powerpc-*) + AC_DEFINE(ARCH_PPC, 1, [Architecture is PowerPC]) + ARCH_SPECIFIC_CFLAGS="" + ARCH_STRING="PowerPC" + ;; + *) + AC_MSG_ERROR([Unknown Architecture]) + ;; +esac +AC_C_BIGENDIAN + +#---------------------------------------------------------------------------- +# Package configuration switches. +#---------------------------------------------------------------------------- +AC_ARG_ENABLE([multithreaded], + [AC_HELP_STRING([--enable-multithreaded], + [build BulletMultiThreaded (default NO)])], + [disable_multithreaded=no], [disable_multithreaded=yes]) +AC_MSG_CHECKING([BulletMultiThreaded]) +AS_IF([test "$disable_multithreaded" = yes], [build_multithreaded=no], [build_multithreaded=yes]) +AC_MSG_RESULT([$build_multithreaded]) +AM_CONDITIONAL([CONDITIONAL_BUILD_MULTITHREADED], [test "$build_multithreaded" = yes]) + +AC_ARG_ENABLE([demos], + [AS_HELP_STRING([--disable-demos], + [disable Bullet demos])], + [], + [enable_demos=yes]) +AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS], [false]) +if test "x$enable_demos" != xno; then + AC_MSG_NOTICE([Building Bullet demos]) + AM_CONDITIONAL([CONDITIONAL_BUILD_DEMOS],[true]) +fi + + + +AC_ARG_ENABLE([debug], + [AC_HELP_STRING([--enable-debug], + [build with debugging information (default NO)])], + [], [enable_debug=no]) + +AC_MSG_CHECKING([build mode]) +AS_IF([test $enable_debug = yes], [build_mode=debug], [build_mode=optimize]) +AC_MSG_RESULT([$build_mode]) + +CFLAGS="$ARCH_SPECIFIC_CFLAGS $CFLAGS" +CXXFLAGS="$ARCH_SPECIFIC_CFLAGS $CXXFLAGS $CFLAGS" + +### end bullet configure script + +AC_CONFIG_FILES([ + Makefile + Documentation/Makefile + hkl3d/Makefile + hkl3d/bullet/Makefile + hkl3d/bullet/src/Makefile + test/Makefile + test/gui/Makefile + test/gui/OpenGL/Makefile + test/gui/DiffabsDemo/Makefile + hkl3d.pc +]) + +AC_OUTPUT diff --git a/hkl3d/bullet/Makefile.am b/hkl3d/bullet/Makefile.am index 6d6d28a..2d304a7 100644 --- a/hkl3d/bullet/Makefile.am +++ b/hkl3d/bullet/Makefile.am @@ -1,3 +1,3 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS=src \ No newline at end of file +SUBDIRS=src diff --git a/hkl3d/bullet/bullet.pc.in b/hkl3d/bullet/bullet.pc.in deleted file mode 100644 index ffcd4f3..0000000 --- a/hkl3d/bullet/bullet.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: bullet -Description: Bullet Continuous Collision Detection and Physics Library -Requires: -Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lBulletSoftBody -lBulletDynamics -lBulletCollision -lLinearMath -Cflags: -I${includedir}/bullet -- 2.11.4.GIT