benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update configure to new nobug version

Browse source
This commit is contained in:
Christian Thaeter 2009-09-05 04:43:21 +02:00
parent ce7c78ef8b
commit d2acbee608
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.am
View file

@ -1,5 +1,5 @@
# Copyright (C) Lumiera.org
# 2007, Christian Thaeter <ct@pipapo.org>
# 2007, 2009 Christian Thaeter <ct@pipapo.org>
# 2008, Joel Holdsworth <joel@airwebreathe.org.uk>
#
# This program is free software; you can redistribute it and/or
@ -35,8 +35,9 @@ CLEANFILES =
# global pre-processor flags. Per-target variables should include
# these at the front (if possible) for consistency
AM_CPPFLAGS = -I$(top_srcdir)/src/ \
$(NOBUGMT_LUMIERA_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/src/ \
$(NOBUGMT_LUMIERA_CFLAGS) \
$(VALGRIND_CFLAGS)
# Only use subdirs if really needed, prefer the include scheme below
#SUBDIRS +=

15
configure.ac
View file

@ -40,6 +40,7 @@ AC_PROG_CXX
AC_LIBTOOL_DLOPEN
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG([0.22])
#
# test for headers
@ -85,9 +86,6 @@ AC_ARG_ENABLE(release, AC_HELP_STRING([--enable-release], [select NoBug RELEASE
# C headers and libraries
AC_LANG_PUSH([C])
AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H))
# there is a warning in nobug, disabled til fixed AC_CHECK_HEADER([valgrind/valgrind.h], AC_DEFINE(HAVE_VALGRIND_VALGRIND_H))
AC_CHECK_LIB(dl, dlopen, [LUMIERA_PLUGIN_LIBS="$LUMIERA_PLUGIN_LIBS -ldl"],
[AC_MSG_ERROR([Dynamic linking not supported, report a bug])]
)
@ -186,15 +184,14 @@ AC_SUBST(LUMIERA_GUI_LIBS)
AC_SUBST(LUMIERA_GUI_CFLAGS)
############## Nobug Dependancies
PKG_CHECK_MODULES(NOBUG_LUMIERA, [nobug >= 0.3rc1],
AC_DEFINE(HAVE_NOBUG_H),
AC_MSG_ERROR([NoBug pkg-config metadata missing (http://www.pipapo.org/pipawiki/NoBug)])
)
PKG_CHECK_MODULES(NOBUGMT_LUMIERA, [nobugmt >= 0.3rc1],
AC_CHECK_HEADER([execinfo.h], AC_DEFINE(HAVE_EXECINFO_H))
PKG_CHECK_MODULES(VALGRIND, [valgrind], AC_DEFINE(HAVE_VALGRIND_H),
AC_MSG_NOTICE([valgrind not found (optional)]))
PKG_CHECK_MODULES(NOBUGMT_LUMIERA, [nobugmt >= 200909.1],
AC_DEFINE(HAVE_NOBUGMT_H),
AC_MSG_ERROR([NoBug pkg-config metadata missing (http://www.pipapo.org/pipawiki/NoBug)])
)
# END Nobug Dependancies
# Print a summary