Skip to content

Commit

Permalink
build: Use pkg-config to check for libuuid
Browse files Browse the repository at this point in the history
e2fsprogs resp. util-linux(-ng) have shipped that file since at least
2009.
  • Loading branch information
mbiebl authored and rgerhards committed Oct 18, 2012
1 parent 2f28799 commit bff0023
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.2)
PKG_CHECK_MODULES(LIBEE, libee >= 0.4.0)
PKG_CHECK_MODULES([JSON_C], [json])
PKG_CHECK_MODULES([LIBUUID], [uuid])

case "${host}" in
*-*-linux*)
Expand Down Expand Up @@ -699,22 +700,6 @@ AM_CONDITIONAL(ENABLE_OMLIBDBI, test x$enable_libdbi = xyes)
AC_SUBST(LIBDBI_CFLAGS)
AC_SUBST(LIBDBI_LIBS)

# libuuid support
AC_CHECK_HEADERS(
[uuid/uuid.h],,
[AC_MSG_FAILURE([libuuid is missing])]
)
AC_CHECK_LIB(
[uuid],
[uuid_generate],
[LIBUUID_CFLAGS=""
LIBUUID_LIBS="-luuid"
],
[AC_MSG_FAILURE([libuuid library is missing])]
)
AC_SUBST(LIBUUID_CFLAGS)
AC_SUBST(LIBUUID_LIBS)

# SNMP support
AC_ARG_ENABLE(snmp,
[AS_HELP_STRING([--enable-snmp],[Enable SNMP support @<:@default=no@:>@])],
Expand Down

0 comments on commit bff0023

Please sign in to comment.