projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add MinGW implementation of UUID functions
[babeltrace.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b983f3525bea74a44e2f8e6a61fab6789fc3579a..a22b1b93a4cea225c228e61df84af070792fee8f 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,7
@@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([babeltrace],[1.
0.0-rc2
],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([babeltrace],[1.
1.1
],[mathieu dot desnoyers at efficios dot com])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
@@
-10,12
+10,14
@@
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
-A
M
_PROG_MKDIR_P
+A
C
_PROG_MKDIR_P
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([config.h])
+AC_SYS_LARGEFILE
+
# Checks for programs.
# Checks for programs.
-AC_PROG_CC
+AC_PROG_CC
_STDC
AC_PROG_MAKE_SET
LT_INIT
AC_PROG_YACC
AC_PROG_MAKE_SET
LT_INIT
AC_PROG_YACC
@@
-35,6
+37,15
@@
AC_FUNC_MALLOC
AC_FUNC_MMAP
AC_CHECK_FUNCS([bzero gettimeofday munmap strtoul])
AC_FUNC_MMAP
AC_CHECK_FUNCS([bzero gettimeofday munmap strtoul])
+# Check for MinGW32.
+MINGW32=no
+case $host in
+ *-*-mingw*)
+ MINGW32=yes;;
+esac
+
+AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
+
# Check for libuuid
AC_CHECK_LIB([uuid], [uuid_generate],
[
# Check for libuuid
AC_CHECK_LIB([uuid], [uuid_generate],
[
@@
-49,7
+60,10
@@
AC_CHECK_LIB([uuid], [uuid_generate],
have_libc_uuid=yes
],
[
have_libc_uuid=yes
],
[
- AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+ # for MinGW32 we have our own internal implemenation of uuid using Windows functions.
+ if test "x$MINGW32" = xno; then
+ AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.])
+ fi
])
]
)
])
]
)
@@
-79,7
+93,7
@@
PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
AC_SUBST(PACKAGE_LIBS)
LIBS="$LIBS $GMODULE_LIBS"
AC_SUBST(PACKAGE_LIBS)
LIBS="$LIBS $GMODULE_LIBS"
-PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
+PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat
-include config.h
"
AC_SUBST(PACKAGE_CFLAGS)
babeltraceincludedir="${includedir}/babeltrace"
AC_SUBST(PACKAGE_CFLAGS)
babeltraceincludedir="${includedir}/babeltrace"
@@
-91,11
+105,13
@@
AC_SUBST(babeltracectfincludedir)
AC_CONFIG_FILES([
Makefile
types/Makefile
AC_CONFIG_FILES([
Makefile
types/Makefile
+ compat/Makefile
formats/Makefile
formats/ctf/Makefile
formats/ctf/types/Makefile
formats/ctf-text/Makefile
formats/ctf-text/types/Makefile
formats/Makefile
formats/ctf/Makefile
formats/ctf/types/Makefile
formats/ctf-text/Makefile
formats/ctf-text/types/Makefile
+ formats/ctf-metadata/Makefile
formats/bt-dummy/Makefile
formats/ctf/metadata/Makefile
converter/Makefile
formats/bt-dummy/Makefile
formats/ctf/metadata/Makefile
converter/Makefile
@@
-104,5
+120,9
@@
AC_CONFIG_FILES([
lib/prio_heap/Makefile
include/Makefile
tests/Makefile
lib/prio_heap/Makefile
include/Makefile
tests/Makefile
+ tests/lib/Makefile
+ extras/Makefile
+ extras/valgrind/Makefile
+ babeltrace.pc
])
AC_OUTPUT
])
AC_OUTPUT
This page took
0.023961 seconds
and
4
git commands to generate.