From 5638d7c776649342a54e9507d3a7dea8a575363f Mon Sep 17 00:00:00 2001
From: Wolfgang Lux <wolfgang.lux@gmail.com>
Date: Mon, 15 Jan 2018 12:03:02 +0100
Subject: [PATCH] Replace broken configure script from last commit

---
 configure | 59 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 15 deletions(-)

diff --git a/configure b/configure
index 163a1b08b..248685f5a 100755
--- a/configure
+++ b/configure
@@ -715,11 +715,8 @@ ac_cv_sizeof_short
 GS_UINT8
 GS_SINT8
 GS_WORDS_BIGENDIAN
-<<<<<<< HEAD
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
-=======
->>>>>>> origin/master
 PKG_CONFIG
 WHOAMI
 EGREP
@@ -5814,7 +5811,6 @@ $as_echo "no" >&6; }
 fi
 
 
-<<<<<<< HEAD
 
 
 
@@ -5826,14 +5822,6 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-=======
-PKG_PROG_PKG_CONFIG
-# If the modern mechanism failswe may havew an older pkg-config
-# so try looking it up the old fashioned way.
-if test -z "$PKG_CONFIG"; then
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
->>>>>>> origin/master
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_path_PKG_CONFIG+:} false; then :
@@ -5873,7 +5861,6 @@ fi
 
 
 fi
-<<<<<<< HEAD
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
@@ -5944,9 +5931,51 @@ $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
-=======
+# If the modern mechanism failswe may havew an older pkg-config
+# so try looking it up the old fashioned way.
+if test -z "$PKG_CONFIG"; then
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
 
->>>>>>> origin/master
 
 #--------------------------------------------------------------------
 # specific target_os options