Commit Diff

Commit:
326237a6c2a5c369201269e581d6eccd38376efc
From:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
FreeBSD: tighten UUID check If UUID libraries are already detected, don't ignore them by then checking pkg-config, etc. Noticed by Christian "naddy" Weisgerber.
Actions:
Patch | Tree
commit - 00ced238c405770dc7df7c18bd32ef055ee03793
commit + 326237a6c2a5c369201269e581d6eccd38376efc
blob - c3f6d3a3df96207adb3645a88553071f00fe841e
blob + febc60ec9dfe3e5a3f42ce573ad749f7bba15b72
--- configure.ac
+++ configure.ac
@@ -212,27 +212,32 @@ if test "x$found_libcrypto" = "xyes"; then
 fi
 
 AC_SEARCH_LIBS(uuid_create, , AC_DEFINE(HAVE_BSD_UUID))
+AC_SEARCH_LIBS(uuid_create, found_uuid=no, found_uuid=yes)
 AC_SEARCH_LIBS(mergesort, , AC_DEFINE(HAVE_BSD_MERGESORT))
 
-PKG_CHECK_MODULES(
-	LIBUUID,
-	uuid,
-	[
-	 	AM_CFLAGS="$LIBUUID_CFLAGS $AM_CFLAGS"
-		CFLAGS="$AM_CFLAGS $SAVED_CFLAGS"
-		LIBS="$LIBUUID_LIBS $LIBS"
-		found_libuuid=yes
-	],
-	[
-	 	found_libuuid=no
-	]
-)
+if test "x$found_uuid" = "xyes"; then
+	AC_DEFINE(HAVE_BSD_UUID)
+else
+	PKG_CHECK_MODULES(
+		LIBUUID,
+		uuid,
+		[
+			AM_CFLAGS="$LIBUUID_CFLAGS $AM_CFLAGS"
+			CFLAGS="$AM_CFLAGS $SAVED_CFLAGS"
+			LIBS="$LIBUUID_LIBS $LIBS"
+			found_libuuid=yes
+		],
+		[
+			found_libuuid=no
+		]
+	)
 
-if test "x$found_libuuid" = "xno"; then
-	AC_CHECK_HEADER(
-		uuid.h,
-		found_libuuid=yes,
-		found_libuuid=no)
+	if test "x$found_libuuid" = "xno"; then
+		AC_CHECK_HEADER(
+			uuid.h,
+			found_libuuid=yes,
+			found_libuuid=no)
+	fi
 fi
 
 if test "x$found_libuuid" = "xno"; then