Make 64 bit compilation on 32 bit compiler possible

[ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1070e2684cbe2d075479e490ca383fa85eae1f47..73e95bb8bacc55458cf01762840840f925f5e5be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,8 @@
 #AC_PREREQ([2.63])
 AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip])
 AC_CONFIG_SRCDIR([ustctl/ustctl.c])
@@ -62,6 +64,47 @@ AC_CHECK_LIB([urcu-bp], [synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburc
 
 AC_CHECK_HEADERS([kcompat.h], [], [AC_MSG_ERROR([Cannot find kcompat headers (kcompat.h). Use [CFLAGS]=-Idir to specify their location.])])
 
+# Check for various supplementary host information (beyond the
+# triplet) which might affect the library format choices.  E.g., we
+# can be building with `i686-unknown-linux-gnu-gcc -m64'
+
+case "${host}" in
+changequote(,)dnl
+  i[34567]86-*-linux*)
+changequote([,])dnl
+    AC_CACHE_CHECK([if building for x86-64], [ust_cv_i386_is_x86_64],
+                    [save_CPPFLAGS="$CPPFLAGS"
+                    CPPFLAGS="$CPPFLAGS $CFLAGS"
+                    AC_EGREP_CPP([got it], [
+#if __x86_64__
+got it
+#endif
+                 ], [ust_cv_i386_is_x86_64=yes],
+                    [ust_cv_i386_is_x86_64=no])
+                    CPPFLAGS="$save_CPPFLAGS"])
+    ;;
+esac
+
+AC_MSG_CHECKING([library format for the host system])
+case $host_cpu in
+changequote(,)dnl
+       i[3456]86)
+changequote([,])dnl
+         if test "$ust_cv_i386_is_x86_64" = yes ; then
+            LIBFORMAT="elf64-x86-64"
+         else
+            LIBFORMAT="elf32-i386"
+         fi
+         ;;
+       x86_64) LIBFORMAT="elf64-x86-64" ;;
+       ppc) LIBFORMAT="elf32-powerpc" ;;
+       ppc64) LIBFORMAT="elf64-powerpc" ;;
+       s390) LIBFORMAT="elf32-s390" ;;
+       s390x) LIBFORMAT="elf64-s390" ;;
+       *) AC_MSG_ERROR([unable to detect library format (unsupported architecture?)]) ;;
+esac
+AC_SUBST(LIBFORMAT)
+AC_MSG_RESULT($LIBFORMAT)
 
 AC_CONFIG_FILES([
        Makefile
@@ -73,6 +116,7 @@ AC_CONFIG_FILES([
        tests/basic/Makefile
        tests/basic_long/Makefile
        tests/fork/Makefile
+       tests/simple_include/Makefile
        libmallocwrap/Makefile
        libinterfork/Makefile
        ustd/Makefile