From e072f4b85bdea3d3ea27820e36a4a6c5960f0d3e Mon Sep 17 00:00:00 2001
From: lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Wed, 21 Apr 2010 19:31:49 +0000
Subject: Forgot to merge the updated configure script.

(issue #17220)

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@258385 f38db490-d61c-443f-a65b-d21fe96a405b
---
 configure | 53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 5 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a9d8480da..a53553e20 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 246199 .
+# From configure.ac Revision: 258384 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk 1.6.
 #
@@ -716,6 +716,7 @@ DOT
 WGET
 CURL
 RUBBER
+CATDVI
 KPATHSEA
 XMLSTARLET
 FETCH
@@ -7460,6 +7461,47 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
+# Extract the first word of "catdvi", so it can be a program name with args.
+set dummy catdvi; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_CATDVI+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $CATDVI in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CATDVI="$CATDVI" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_CATDVI="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_CATDVI" && ac_cv_path_CATDVI=":"
+  ;;
+esac
+fi
+CATDVI=$ac_cv_path_CATDVI
+if test -n "$CATDVI"; then
+  { echo "$as_me:$LINENO: result: $CATDVI" >&5
+echo "${ECHO_T}$CATDVI" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
 # Extract the first word of "kpsewhich", so it can be a program name with args.
 set dummy kpsewhich; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -43381,6 +43423,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+CATDVI!$CATDVI$ac_delim
 KPATHSEA!$KPATHSEA$ac_delim
 XMLSTARLET!$XMLSTARLET$ac_delim
 FETCH!$FETCH$ac_delim
@@ -43477,7 +43520,6 @@ PBX_JACK!$PBX_JACK$ac_delim
 LDAP_LIB!$LDAP_LIB$ac_delim
 LDAP_INCLUDE!$LDAP_INCLUDE$ac_delim
 LDAP_DIR!$LDAP_DIR$ac_delim
-PBX_LDAP!$PBX_LDAP$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -43519,6 +43561,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PBX_LDAP!$PBX_LDAP$ac_delim
 LIBXML2_LIB!$LIBXML2_LIB$ac_delim
 LIBXML2_INCLUDE!$LIBXML2_INCLUDE$ac_delim
 LIBXML2_DIR!$LIBXML2_DIR$ac_delim
@@ -43615,7 +43658,6 @@ SDL_LIB!$SDL_LIB$ac_delim
 SDL_INCLUDE!$SDL_INCLUDE$ac_delim
 SDL_DIR!$SDL_DIR$ac_delim
 PBX_SDL!$PBX_SDL$ac_delim
-SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -43657,6 +43699,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+SDL_IMAGE_LIB!$SDL_IMAGE_LIB$ac_delim
 SDL_IMAGE_INCLUDE!$SDL_IMAGE_INCLUDE$ac_delim
 SDL_IMAGE_DIR!$SDL_IMAGE_DIR$ac_delim
 PBX_SDL_IMAGE!$PBX_SDL_IMAGE$ac_delim
@@ -43753,7 +43796,6 @@ PBX_IP_MTU_DISCOVER!$PBX_IP_MTU_DISCOVER$ac_delim
 PBX_DAHDI_HALF_FULL!$PBX_DAHDI_HALF_FULL$ac_delim
 GSM_INTERNAL!$GSM_INTERNAL$ac_delim
 CONFIG_LIBXML2!$CONFIG_LIBXML2$ac_delim
-PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -43795,6 +43837,7 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PBX_MISDN_FAC_RESULT!$PBX_MISDN_FAC_RESULT$ac_delim
 PBX_MISDN_FAC_ERROR!$PBX_MISDN_FAC_ERROR$ac_delim
 CONFIG_NETSNMP!$CONFIG_NETSNMP$ac_delim
 PG_CONFIG!$PG_CONFIG$ac_delim
@@ -43825,7 +43868,7 @@ PBX_GENERIC_ODBC!$PBX_GENERIC_ODBC$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-- 
cgit v1.2.3