X-Git-Url: https://git.lttng.org/?p=ust.git;a=blobdiff_plain;f=configure.ac;h=caa599d9ccfb6348f9577c04be598beab3ac23c4;hp=bc8c325e9ceb9a49f49da8f9155bd6af225a348e;hb=e7cc3e3415e0092809627e89168e1cba8b5800f6;hpb=55ad629d916dc8a9e0e8859bd469815dc9ec6ceb

diff --git a/configure.ac b/configure.ac
index bc8c325..caa599d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,10 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 #AC_PREREQ([2.63])
-AC_INIT([ust], [0.0], [pierre-marc dot fournier at polymtl dot ca])
+AC_INIT([ust], [0.6], [pierre-marc dot fournier at polymtl dot ca])
 AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([0.0 foreign dist-bzip2 no-dist-gzip])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
+AC_CONFIG_MACRO_DIR([config])
+AM_INIT_AUTOMAKE([foreign])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([ustctl/ustctl.c])
 AC_CONFIG_HEADERS([config.h])
 
@@ -50,33 +53,61 @@ AC_C_INLINE
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
 
-AC_ARG_WITH(urcu, [  --with-urcu path        Path to userspace RCU source], [
-	AC_CHECK_FILE(["$withval/urcu.h"], [
-		URCU_CFLAGS="-I$withval"
-		URCU_LIBS="-L$withval -lurcu-bp" ],
-		AC_MSG_ERROR([Cannot find urcu.h in urcu directory]))
-], [
-	PKG_CHECK_MODULES(URCU, [liburcu], , [
-		AC_MSG_ERROR([Must specify urcu path.])])
-])
-AC_SUBST(URCU_CFLAGS)
-AC_SUBST(URCU_LIBS)
+# URCU
 
-AC_ARG_WITH(kcompat, [  --with-kcompat path     Path to userspace kcompat source
-], [
-        AC_CHECK_FILE("$withval/kcompat.h", [
-                KCOMPAT_CFLAGS="-I$withval $URCU_CFLAGS"
-                KCOMPAT_LIBS=
-                ], AC_MSG_ERROR([Cannot find kcompat.h in kcompat directory]))
-], [
-        PKG_CHECK_MODULES(KCOMPAT, [libkcompat], , [
-		AC_MSG_ERROR([Must specify kcompat path.])])
-])
-AC_SUBST(KCOMPAT_CFLAGS)
-AC_SUBST(KCOMPAT_LIBS)
+# urcu - check if we just find the headers it out of the box.
+AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.
+This error can also occur when the liburcu package's configure script has not been run.])])
+
+# urcu - check that URCU lib is available to compilation
+AC_CHECK_LIB([urcu-bp], [synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its 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" ;;
+	powerpc) 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 ($host_cpu)?)]) ;;
+esac
+AC_SUBST(LIBFORMAT)
+AC_MSG_RESULT($LIBFORMAT)
 
 AC_CONFIG_FILES([
 	Makefile
+	doc/Makefile
+	include/Makefile
 	libust/Makefile
 	tests/Makefile
 	tests/hello/Makefile
@@ -84,10 +115,18 @@ AC_CONFIG_FILES([
 	tests/basic/Makefile
 	tests/basic_long/Makefile
 	tests/fork/Makefile
-	libmallocwrap/Makefile
-	libinterfork/Makefile
+	tests/simple_include/Makefile
+	tests/snprintf/Makefile
+	tests/test-nevents/Makefile
+	tests/test-libustinstr-malloc/Makefile
+	tests/dlopen/Makefile
+	tests/same_line_marker/Makefile
+	libustinstr-malloc/Makefile
+	libustfork/Makefile
+	libustd/Makefile
 	ustd/Makefile
 	ustctl/Makefile
-	java/Makefile
+	libustcomm/Makefile
+	snprintf/Makefile
 ])
 AC_OUTPUT