From 0abe6836d4b43bfda1d1bdfb717d224325257ff0 Mon Sep 17 00:00:00 2001 From: Mika Bostrom Date: Thu, 2 Dec 2010 06:59:04 +0200 Subject: [PATCH] Use embedded uthash Disable checking of system-wide uthash libraries, provide the local path header search path for libsmack build. --- configure.ac | 2 -- src/Makefile.am | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 871511d..8a81e82 100644 --- a/configure.ac +++ b/configure.ac @@ -31,8 +31,6 @@ AC_CHECK_HEADER([attr/xattr.h],[ AC_MSG_ERROR([Cannot find libattr header attr/xattr.h]) ]) -AC_CHECK_HEADERS([utarray.h uthash.h utlist.h utstring.h],, - [AC_MSG_ERROR(Cannot find uthash headers)]) PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile doc/Makefile libsmack.spec]) diff --git a/src/Makefile.am b/src/Makefile.am index 8a21bfa..c33ce19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libsmack.la +AM_CFLAGS = -I../3rdparty/uthash-1.9.3/src + libsmack_la_LDFLAGS = -version-info 1:0 libsmack_la_SOURCES = smack_internal.c smack_rules.c smack_xattr.c smack_labels.c smack_misc.c -- 2.7.4