properly install libustd and libustcmd

[ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 64a708adf1e6268b7c20d5526cba8970083882c3..af40e5254f630cc3df5dd8697aca26e35a585eca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,12 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 #AC_PREREQ([2.63])
-AC_INIT([ust], [0.2], [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_CANONICAL_TARGET
 AC_CANONICAL_HOST
-AC_CONFIG_MACRO_DIR([m4])
+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])
 
@@ -61,10 +62,6 @@ This error can also occur when the liburcu package's configure script has not be
 # 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.])])
 
-# kcompat
-
-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'
@@ -98,17 +95,18 @@ changequote([,])dnl
          fi
          ;;
        x86_64) LIBFORMAT="elf64-x86-64" ;;
-       ppc) LIBFORMAT="elf32-powerpc" ;;
+       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?)]) ;;
+       *) 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
@@ -118,10 +116,18 @@ AC_CONFIG_FILES([
        tests/basic_long/Makefile
        tests/fork/Makefile
        tests/simple_include/Makefile
-       libmallocwrap/Makefile
-       libinterfork/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
+       libustcomm/Makefile
+       libustcmd/Makefile
        snprintf/Makefile
 ])
 AC_OUTPUT