Merged revisions 272254,272256 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r272254 | twilson | 2010-06-23 15:53:48 -0500 (Wed, 23 Jun 2010) | 10 lines

  Honor the --with-${library}=path for AST_EXT_TOOL_CHECK

  (closes issue #16991)
  Reported by: pprindeville
  Patches:
        with_netsnmp.patch.txt uploaded by twilson (license 396)
  Tested by: twilson

  Review: https://reviewboard.asterisk.org/r/739/
........
  r272256 | twilson | 2010-06-23 15:59:17 -0500 (Wed, 23 Jun 2010) | 2 lines

  Update configure when changing autconf m4 files...
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@272440 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/autoconf/ast_ext_tool_check.m4 b/autoconf/ast_ext_tool_check.m4
index 22ea17b909c4a906e12c24453333fbef279674fb..bbb522f04eca76eff94ddcf41fba63b87fb034d3 100644 (file)
--- a/autoconf/ast_ext_tool_check.m4
+++ b/autoconf/ast_ext_tool_check.m4
@@ -7,7 +7,7 @@ AC_DEFUN([AST_EXT_TOOL_CHECK],
 [
     if test "x${PBX_$1}" != "x1" -a "${USE_$1}" != "no"; then
        PBX_$1=0
-       AC_CHECK_TOOL(CONFIG_$1, $2-config, No)
+       AC_PATH_TOOL(CONFIG_$1, $2-config, No, [${$1_DIR}/bin:$PATH])
        if test ! "x${CONFIG_$1}" = xNo; then
            if test x"$3" = x ; then A=--cflags ; else A="$3" ; fi
            $1_INCLUDE=$(${CONFIG_$1} $A)

diff --git a/configure b/configure
index 9f7f4fcab2f8af5406d90bc846cfc24c3876b7f0..2e11f3b392281564ca9c264ab1ad7b09e94afa7d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 268128 .
+# From configure.ac Revision: 268815 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk 1.6.2.
 #
@@ -17184,20 +17184,23 @@ if test "${disable_xmldoc}" != "yes"; then
 set dummy ${ac_tool_prefix}xml2-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 test "${ac_cv_prog_CONFIG_LIBXML2+set}" = set; then :
+if test "${ac_cv_path_CONFIG_LIBXML2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CONFIG_LIBXML2"; then
-  ac_cv_prog_CONFIG_LIBXML2="$CONFIG_LIBXML2" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $CONFIG_LIBXML2 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CONFIG_LIBXML2="$CONFIG_LIBXML2" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${LIBXML2_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CONFIG_LIBXML2="${ac_tool_prefix}xml2-config"
+    ac_cv_path_CONFIG_LIBXML2="$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
@@ -17205,9 +17208,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-CONFIG_LIBXML2=$ac_cv_prog_CONFIG_LIBXML2
+CONFIG_LIBXML2=$ac_cv_path_CONFIG_LIBXML2
 if test -n "$CONFIG_LIBXML2"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_LIBXML2" >&5
 $as_echo "$CONFIG_LIBXML2" >&6; }
@@ -17218,26 +17222,29 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_CONFIG_LIBXML2"; then
-  ac_ct_CONFIG_LIBXML2=$CONFIG_LIBXML2
+if test -z "$ac_cv_path_CONFIG_LIBXML2"; then
+  ac_pt_CONFIG_LIBXML2=$CONFIG_LIBXML2
   # Extract the first word of "xml2-config", so it can be a program name with args.
 set dummy xml2-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 test "${ac_cv_prog_ac_ct_CONFIG_LIBXML2+set}" = set; then :
+if test "${ac_cv_path_ac_pt_CONFIG_LIBXML2+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CONFIG_LIBXML2"; then
-  ac_cv_prog_ac_ct_CONFIG_LIBXML2="$ac_ct_CONFIG_LIBXML2" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $ac_pt_CONFIG_LIBXML2 in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CONFIG_LIBXML2="$ac_pt_CONFIG_LIBXML2" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${LIBXML2_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CONFIG_LIBXML2="xml2-config"
+    ac_cv_path_ac_pt_CONFIG_LIBXML2="$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
@@ -17245,18 +17252,19 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_CONFIG_LIBXML2=$ac_cv_prog_ac_ct_CONFIG_LIBXML2
-if test -n "$ac_ct_CONFIG_LIBXML2"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CONFIG_LIBXML2" >&5
-$as_echo "$ac_ct_CONFIG_LIBXML2" >&6; }
+ac_pt_CONFIG_LIBXML2=$ac_cv_path_ac_pt_CONFIG_LIBXML2
+if test -n "$ac_pt_CONFIG_LIBXML2"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_LIBXML2" >&5
+$as_echo "$ac_pt_CONFIG_LIBXML2" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CONFIG_LIBXML2" = x; then
+  if test "x$ac_pt_CONFIG_LIBXML2" = x; then
     CONFIG_LIBXML2="No"
   else
     case $cross_compiling:$ac_tool_warned in
@@ -17265,10 +17273,10 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CONFIG_LIBXML2=$ac_ct_CONFIG_LIBXML2
+    CONFIG_LIBXML2=$ac_pt_CONFIG_LIBXML2
   fi
 else
-  CONFIG_LIBXML2="$ac_cv_prog_CONFIG_LIBXML2"
+  CONFIG_LIBXML2="$ac_cv_path_CONFIG_LIBXML2"
 fi
 
        if test ! "x${CONFIG_LIBXML2}" = xNo; then
@@ -17972,20 +17980,23 @@ fi
 set dummy ${ac_tool_prefix}net-snmp-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 test "${ac_cv_prog_CONFIG_NETSNMP+set}" = set; then :
+if test "${ac_cv_path_CONFIG_NETSNMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CONFIG_NETSNMP"; then
-  ac_cv_prog_CONFIG_NETSNMP="$CONFIG_NETSNMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $CONFIG_NETSNMP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CONFIG_NETSNMP="$CONFIG_NETSNMP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${NETSNMP_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CONFIG_NETSNMP="${ac_tool_prefix}net-snmp-config"
+    ac_cv_path_CONFIG_NETSNMP="$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
@@ -17993,9 +18004,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-CONFIG_NETSNMP=$ac_cv_prog_CONFIG_NETSNMP
+CONFIG_NETSNMP=$ac_cv_path_CONFIG_NETSNMP
 if test -n "$CONFIG_NETSNMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_NETSNMP" >&5
 $as_echo "$CONFIG_NETSNMP" >&6; }
@@ -18006,26 +18018,29 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_CONFIG_NETSNMP"; then
-  ac_ct_CONFIG_NETSNMP=$CONFIG_NETSNMP
+if test -z "$ac_cv_path_CONFIG_NETSNMP"; then
+  ac_pt_CONFIG_NETSNMP=$CONFIG_NETSNMP
   # Extract the first word of "net-snmp-config", so it can be a program name with args.
 set dummy net-snmp-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 test "${ac_cv_prog_ac_ct_CONFIG_NETSNMP+set}" = set; then :
+if test "${ac_cv_path_ac_pt_CONFIG_NETSNMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CONFIG_NETSNMP"; then
-  ac_cv_prog_ac_ct_CONFIG_NETSNMP="$ac_ct_CONFIG_NETSNMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $ac_pt_CONFIG_NETSNMP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CONFIG_NETSNMP="$ac_pt_CONFIG_NETSNMP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${NETSNMP_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CONFIG_NETSNMP="net-snmp-config"
+    ac_cv_path_ac_pt_CONFIG_NETSNMP="$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
@@ -18033,18 +18048,19 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_CONFIG_NETSNMP=$ac_cv_prog_ac_ct_CONFIG_NETSNMP
-if test -n "$ac_ct_CONFIG_NETSNMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CONFIG_NETSNMP" >&5
-$as_echo "$ac_ct_CONFIG_NETSNMP" >&6; }
+ac_pt_CONFIG_NETSNMP=$ac_cv_path_ac_pt_CONFIG_NETSNMP
+if test -n "$ac_pt_CONFIG_NETSNMP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_NETSNMP" >&5
+$as_echo "$ac_pt_CONFIG_NETSNMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CONFIG_NETSNMP" = x; then
+  if test "x$ac_pt_CONFIG_NETSNMP" = x; then
     CONFIG_NETSNMP="No"
   else
     case $cross_compiling:$ac_tool_warned in
@@ -18053,10 +18069,10 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CONFIG_NETSNMP=$ac_ct_CONFIG_NETSNMP
+    CONFIG_NETSNMP=$ac_pt_CONFIG_NETSNMP
   fi
 else
-  CONFIG_NETSNMP="$ac_cv_prog_CONFIG_NETSNMP"
+  CONFIG_NETSNMP="$ac_cv_path_CONFIG_NETSNMP"
 fi
 
        if test ! "x${CONFIG_NETSNMP}" = xNo; then
@@ -22469,20 +22485,23 @@ fi
 set dummy ${ac_tool_prefix}gmime-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 test "${ac_cv_prog_CONFIG_GMIME+set}" = set; then :
+if test "${ac_cv_path_CONFIG_GMIME+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CONFIG_GMIME"; then
-  ac_cv_prog_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $CONFIG_GMIME in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CONFIG_GMIME="$CONFIG_GMIME" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${GMIME_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CONFIG_GMIME="${ac_tool_prefix}gmime-config"
+    ac_cv_path_CONFIG_GMIME="$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
@@ -22490,9 +22509,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-CONFIG_GMIME=$ac_cv_prog_CONFIG_GMIME
+CONFIG_GMIME=$ac_cv_path_CONFIG_GMIME
 if test -n "$CONFIG_GMIME"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GMIME" >&5
 $as_echo "$CONFIG_GMIME" >&6; }
@@ -22503,26 +22523,29 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_CONFIG_GMIME"; then
-  ac_ct_CONFIG_GMIME=$CONFIG_GMIME
+if test -z "$ac_cv_path_CONFIG_GMIME"; then
+  ac_pt_CONFIG_GMIME=$CONFIG_GMIME
   # Extract the first word of "gmime-config", so it can be a program name with args.
 set dummy gmime-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 test "${ac_cv_prog_ac_ct_CONFIG_GMIME+set}" = set; then :
+if test "${ac_cv_path_ac_pt_CONFIG_GMIME+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CONFIG_GMIME"; then
-  ac_cv_prog_ac_ct_CONFIG_GMIME="$ac_ct_CONFIG_GMIME" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $ac_pt_CONFIG_GMIME in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CONFIG_GMIME="$ac_pt_CONFIG_GMIME" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${GMIME_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CONFIG_GMIME="gmime-config"
+    ac_cv_path_ac_pt_CONFIG_GMIME="$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
@@ -22530,18 +22553,19 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_CONFIG_GMIME=$ac_cv_prog_ac_ct_CONFIG_GMIME
-if test -n "$ac_ct_CONFIG_GMIME"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CONFIG_GMIME" >&5
-$as_echo "$ac_ct_CONFIG_GMIME" >&6; }
+ac_pt_CONFIG_GMIME=$ac_cv_path_ac_pt_CONFIG_GMIME
+if test -n "$ac_pt_CONFIG_GMIME"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GMIME" >&5
+$as_echo "$ac_pt_CONFIG_GMIME" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CONFIG_GMIME" = x; then
+  if test "x$ac_pt_CONFIG_GMIME" = x; then
     CONFIG_GMIME="No"
   else
     case $cross_compiling:$ac_tool_warned in
@@ -22550,10 +22574,10 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CONFIG_GMIME=$ac_ct_CONFIG_GMIME
+    CONFIG_GMIME=$ac_pt_CONFIG_GMIME
   fi
 else
-  CONFIG_GMIME="$ac_cv_prog_CONFIG_GMIME"
+  CONFIG_GMIME="$ac_cv_path_CONFIG_GMIME"
 fi
 
        if test ! "x${CONFIG_GMIME}" = xNo; then
@@ -23770,20 +23794,23 @@ fi
 set dummy ${ac_tool_prefix}sdl-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 test "${ac_cv_prog_CONFIG_SDL+set}" = set; then :
+if test "${ac_cv_path_CONFIG_SDL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CONFIG_SDL"; then
-  ac_cv_prog_CONFIG_SDL="$CONFIG_SDL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $CONFIG_SDL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CONFIG_SDL="$CONFIG_SDL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${SDL_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CONFIG_SDL="${ac_tool_prefix}sdl-config"
+    ac_cv_path_CONFIG_SDL="$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
@@ -23791,9 +23818,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-CONFIG_SDL=$ac_cv_prog_CONFIG_SDL
+CONFIG_SDL=$ac_cv_path_CONFIG_SDL
 if test -n "$CONFIG_SDL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_SDL" >&5
 $as_echo "$CONFIG_SDL" >&6; }
@@ -23804,26 +23832,29 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_CONFIG_SDL"; then
-  ac_ct_CONFIG_SDL=$CONFIG_SDL
+if test -z "$ac_cv_path_CONFIG_SDL"; then
+  ac_pt_CONFIG_SDL=$CONFIG_SDL
   # Extract the first word of "sdl-config", so it can be a program name with args.
 set dummy sdl-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 test "${ac_cv_prog_ac_ct_CONFIG_SDL+set}" = set; then :
+if test "${ac_cv_path_ac_pt_CONFIG_SDL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CONFIG_SDL"; then
-  ac_cv_prog_ac_ct_CONFIG_SDL="$ac_ct_CONFIG_SDL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $ac_pt_CONFIG_SDL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CONFIG_SDL="$ac_pt_CONFIG_SDL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${SDL_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CONFIG_SDL="sdl-config"
+    ac_cv_path_ac_pt_CONFIG_SDL="$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
@@ -23831,18 +23862,19 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_CONFIG_SDL=$ac_cv_prog_ac_ct_CONFIG_SDL
-if test -n "$ac_ct_CONFIG_SDL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CONFIG_SDL" >&5
-$as_echo "$ac_ct_CONFIG_SDL" >&6; }
+ac_pt_CONFIG_SDL=$ac_cv_path_ac_pt_CONFIG_SDL
+if test -n "$ac_pt_CONFIG_SDL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_SDL" >&5
+$as_echo "$ac_pt_CONFIG_SDL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CONFIG_SDL" = x; then
+  if test "x$ac_pt_CONFIG_SDL" = x; then
     CONFIG_SDL="No"
   else
     case $cross_compiling:$ac_tool_warned in
@@ -23851,10 +23883,10 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CONFIG_SDL=$ac_ct_CONFIG_SDL
+    CONFIG_SDL=$ac_pt_CONFIG_SDL
   fi
 else
-  CONFIG_SDL="$ac_cv_prog_CONFIG_SDL"
+  CONFIG_SDL="$ac_cv_path_CONFIG_SDL"
 fi
 
        if test ! "x${CONFIG_SDL}" = xNo; then
@@ -24381,20 +24413,23 @@ PBX_GTK=0
 set dummy ${ac_tool_prefix}gtk-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 test "${ac_cv_prog_CONFIG_GTK+set}" = set; then :
+if test "${ac_cv_path_CONFIG_GTK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$CONFIG_GTK"; then
-  ac_cv_prog_CONFIG_GTK="$CONFIG_GTK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $CONFIG_GTK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CONFIG_GTK="$CONFIG_GTK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${GTK_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CONFIG_GTK="${ac_tool_prefix}gtk-config"
+    ac_cv_path_CONFIG_GTK="$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
@@ -24402,9 +24437,10 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-CONFIG_GTK=$ac_cv_prog_CONFIG_GTK
+CONFIG_GTK=$ac_cv_path_CONFIG_GTK
 if test -n "$CONFIG_GTK"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONFIG_GTK" >&5
 $as_echo "$CONFIG_GTK" >&6; }
@@ -24415,26 +24451,29 @@ fi
 
 
 fi
-if test -z "$ac_cv_prog_CONFIG_GTK"; then
-  ac_ct_CONFIG_GTK=$CONFIG_GTK
+if test -z "$ac_cv_path_CONFIG_GTK"; then
+  ac_pt_CONFIG_GTK=$CONFIG_GTK
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-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 test "${ac_cv_prog_ac_ct_CONFIG_GTK+set}" = set; then :
+if test "${ac_cv_path_ac_pt_CONFIG_GTK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_CONFIG_GTK"; then
-  ac_cv_prog_ac_ct_CONFIG_GTK="$ac_ct_CONFIG_GTK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
+  case $ac_pt_CONFIG_GTK in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_CONFIG_GTK="$ac_pt_CONFIG_GTK" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="${GTK_DIR}/bin:$PATH"
+for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CONFIG_GTK="gtk-config"
+    ac_cv_path_ac_pt_CONFIG_GTK="$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
@@ -24442,18 +24481,19 @@ done
   done
 IFS=$as_save_IFS
 
+  ;;
+esac
 fi
-fi
-ac_ct_CONFIG_GTK=$ac_cv_prog_ac_ct_CONFIG_GTK
-if test -n "$ac_ct_CONFIG_GTK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CONFIG_GTK" >&5
-$as_echo "$ac_ct_CONFIG_GTK" >&6; }
+ac_pt_CONFIG_GTK=$ac_cv_path_ac_pt_CONFIG_GTK
+if test -n "$ac_pt_CONFIG_GTK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_CONFIG_GTK" >&5
+$as_echo "$ac_pt_CONFIG_GTK" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_CONFIG_GTK" = x; then
+  if test "x$ac_pt_CONFIG_GTK" = x; then
     CONFIG_GTK="No"
   else
     case $cross_compiling:$ac_tool_warned in
@@ -24462,10 +24502,10 @@ yes:)
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    CONFIG_GTK=$ac_ct_CONFIG_GTK
+    CONFIG_GTK=$ac_pt_CONFIG_GTK
   fi
 else
-  CONFIG_GTK="$ac_cv_prog_CONFIG_GTK"
+  CONFIG_GTK="$ac_cv_path_CONFIG_GTK"
 fi
 
        if test ! "x${CONFIG_GTK}" = xNo; then