$OpenBSD: patch-configure,v 1.13 2013/07/07 02:46:26 jsg Exp $
--- configure.orig	Mon May 27 06:21:47 2013
+++ configure	Sun Jul  7 00:14:14 2013
@@ -1762,21 +1762,6 @@ if test "$_use_cxx11" = "yes" ; then
 fi
 echo $_use_cxx11
 
-# By default, we add -pedantic to the CXXFLAGS to catch some potentially
-# non-portable constructs, like use of GNU extensions.
-# However, some platforms use GNU extensions in system header files, so
-# for these we must not use -pedantic.
-case $_host_os in
-android | gamecube | psp | wii | webos)
-	;;
-*)
-	# ICC does not support pedantic, while GCC and clang do.
-	if test "$have_icc" = no ; then
-		CXXFLAGS="$CXXFLAGS -pedantic"
-	fi
-	;;
-esac
-
 # If possible, we want to use -Wglobal-constructors
 # However, not all compilers support that, so check whether the active one does.
 echocheck "whether -Wglobal-constructors work"
@@ -3278,9 +3263,9 @@ EOF
 fi
 if test "$_flac" = yes ; then
 	if test "$_vorbis" = yes ; then
-		LIBS="$LIBS $FLAC_LIBS $OGG_LIBS -lFLAC -logg"
+		LIBS="$LIBS `pkg-config --libs flac` -logg"
 	else
-		LIBS="$LIBS $FLAC_LIBS -lFLAC"
+		LIBS="$LIBS `pkg-config --libs flac`"
 	fi
 	INCLUDES="$INCLUDES $FLAC_CFLAGS"
 fi
