$OpenBSD: patch-configure,v 1.8 2011/04/27 11:09:50 ajacoutot Exp $

uuid_generate(3):
    needs e2fs-uuid from sysutils/e2fsprogs over libuuid (devel/uuid).

--- configure.orig	Wed Apr 27 12:05:07 2011
+++ configure	Wed Apr 27 12:39:53 2011
@@ -17075,12 +17075,12 @@ if test -n "$UUID_CFLAGS"; then
     pkg_cv_UUID_CFLAGS="$UUID_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"e2fs-uuid\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "e2fs-uuid") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "uuid" 2>/dev/null`
+  pkg_cv_UUID_CFLAGS=`$PKG_CONFIG --cflags "e2fs-uuid" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -17091,12 +17091,12 @@ if test -n "$UUID_LIBS"; then
     pkg_cv_UUID_LIBS="$UUID_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"uuid\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "uuid") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"e2fs-uuid\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "e2fs-uuid") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "uuid" 2>/dev/null`
+  pkg_cv_UUID_LIBS=`$PKG_CONFIG --libs "e2fs-uuid" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -17116,14 +17116,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "uuid" 2>&1`
+	        UUID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "e2fs-uuid" 2>&1`
         else
-	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "uuid" 2>&1`
+	        UUID_PKG_ERRORS=`$PKG_CONFIG --print-errors "e2fs-uuid" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$UUID_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (uuid) were not met:
+	as_fn_error $? "Package requirements (e2fs-uuid) were not met:
 
 $UUID_PKG_ERRORS
 
@@ -17380,7 +17380,7 @@ if test "${ac_cv_lib_id3_ID3Tag_New+set}" = set; then 
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lid3 -lstdc++ -lz $LIBS"
+LIBS="-lid3 -lstdc++ -lz -lm $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -17415,7 +17415,7 @@ if test "x$ac_cv_lib_id3_ID3Tag_New" = x""yes; then :
 #define HAVE_LIBID3 1
 _ACEOF
 
-  LIBS="-lid3 $LIBS"
+  LIBS="-lid3 -lm $LIBS"
 
 fi
 
@@ -21172,8 +21172,8 @@ fi
 
 
    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-glib <= 0.14\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "poppler-glib <= 0.14") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"poppler-glib <= 0.15\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "poppler-glib <= 0.15") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then