[zaptel-commits] tzafrir: branch tzafrir/kernelmove_conf r2803 - in /team/tzafrir/kernelmove_c...

SVN commits to the Zaptel project zaptel-commits at lists.digium.com
Tue Jul 31 01:57:03 CDT 2007


Author: tzafrir
Date: Tue Jul 31 01:57:03 2007
New Revision: 2803

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2803
Log:
Added support for external dependencies (e.g.: libraries).
An item can have Available: 0 . If so: it will be considered "missing"
and not be added automatically.

The menuselect replacement is now fully-functional, though a bit rough.

Modified:
    team/tzafrir/kernelmove_conf/TODO
    team/tzafrir/kernelmove_conf/acinclude.m4
    team/tzafrir/kernelmove_conf/build_tools/config_info
    team/tzafrir/kernelmove_conf/configure
    team/tzafrir/kernelmove_conf/configure.ac
    team/tzafrir/kernelmove_conf/zttool.c

Modified: team/tzafrir/kernelmove_conf/TODO
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/TODO?view=diff&rev=2803&r1=2802&r2=2803
==============================================================================
--- team/tzafrir/kernelmove_conf/TODO (original)
+++ team/tzafrir/kernelmove_conf/TODO Tue Jul 31 01:57:03 2007
@@ -3,8 +3,10 @@
 * userspace build.
 * Integrate kernel configuration into autoconf.
 * Integrate untilities configuration into autoconf (manual list).
+* Support external dependencies.
 
 TODO:
+* Reporting of missing dependencies is ugly.
 * Double-check wctdm24xxp (on 2.4, mainly).
 * Remove EXPORT_ALL_VARIABLES.
 * Add config_info for the utilities as well.

Modified: team/tzafrir/kernelmove_conf/acinclude.m4
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/acinclude.m4?view=diff&rev=2803&r1=2802&r2=2803
==============================================================================
--- team/tzafrir/kernelmove_conf/acinclude.m4 (original)
+++ team/tzafrir/kernelmove_conf/acinclude.m4 Tue Jul 31 01:57:03 2007
@@ -68,6 +68,13 @@
 AC_SUBST([$4_LIB])
 AC_SUBST([$4_INCLUDE])
 AC_SUBST([PBX_LIB$4])
+
+cat <<EOF >>build_conf/libs
+Item: lib$4
+Description: The library $5
+Available: ${PBX_LIB$4}
+
+EOF
 ])
 
 

Modified: team/tzafrir/kernelmove_conf/build_tools/config_info
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/build_tools/config_info?view=diff&rev=2803&r1=2802&r2=2803
==============================================================================
--- team/tzafrir/kernelmove_conf/build_tools/config_info (original)
+++ team/tzafrir/kernelmove_conf/build_tools/config_info Tue Jul 31 01:57:03 2007
@@ -12,7 +12,7 @@
 my $format = 'lines';
 my $print_only_default = 0;
 
-my @AllCategories = qw/modules utils/;
+my @AllCategories = qw/modules utils libs/;
 
 sub usage() {
   print STDERR
@@ -111,6 +111,85 @@
   print "\n";
 }
 
+# check a cat_item that its category and name exist in the
+# configuration:
+sub item_cat_name_check($$) {
+	my ($cat_item,$conf) = @_;
+
+  my $item     = $cat_item->{'item'};
+  my $category = $cat_item->{'category'};
+  if (not exists $conf->{$category}) {
+    print STDERR "$0: Warning caetgory '$category' not found in configuration. Dropping $item.\n";
+    return 0;
+  }
+  if (!exists $conf->{$category}{$item}){
+    print STDERR "$0: Warning: item '$item' not found in configuration. Dropping\n";
+    return 0;
+  }
+	return 1
+}
+
+# Input: item to check for dependencies.
+# Output: extra dependencies needed to be added.
+#
+# Run a BFS search over the dependencies tree.
+# If all dependencies are satisfied, returns a list of extra items that
+# need to be cheked to allow building.
+#
+# If some a specific dependency cannot be satisfied, it will give a
+# warning that item A needs dependency X and return an empty list.
+sub resolve_dependencies($$$) {
+	my $cat_item        = shift; # The original item to check
+	my $conf            = shift;
+	my $deps_map_global = shift;
+
+  my $main_item       = $cat_item->{'item'};
+  my $main_cat        = $cat_item->{'category'};
+	
+	my $deps_map_local  = {}; # a local supplimantary deps_map
+  my @cat_items       = ($cat_item);
+
+  for (my $cat_item = shift @cat_items; defined $cat_item; $cat_item = shift @cat_items){
+		my $item = $cat_item->{'item'};
+		my $category = $cat_item->{'category'};
+
+		next if (exists $deps_map_global->{$item}{'seen'});
+
+    # now we know it is not marked in the global map. Mark it and
+    # process it.
+		next if (exists $deps_map_local->{$item}{'seen'});
+
+		if ((exists $conf->{$category}{$item}{Available}) &&
+			($conf->{$category}{$item}{Available} eq '0' ) 
+		){
+			print STDERR 
+			  "$0: Notice: cannot configure item $main_item because $item ".
+        "is not available.\n";
+			return ();
+		}
+		$deps_map_local->{$item}{'seen'} = 1;
+
+    next unless (exists $conf->{$category}{$item}{'Depends'});
+		my @deps = split(/[ ,]+/, $conf->{$category}{$item}{'Depends'});
+
+		foreach my $dep (@deps) {
+      # This shouldn't happen:
+			if (! exists $deps_map_global->{$dep}) {
+        print STDERR 
+          "$0: Notice: item $item (needed for $main_item) ".
+          "has an inappropriate dependency $dep. Dropping $main_item.\n";
+        return ();
+      }
+      #print STDERR "item: $item, dep: $dep\n";
+			# Add it to our scanning list:
+			my $dep_cat = $deps_map_global->{$dep}{'category'};
+			push(@cat_items, ({'item'=>$dep, 'category'=>$dep_cat}));
+		}
+	}
+
+  # return all items we marked.
+  return keys(%$deps_map_local);
+}
 
 sub run_fixdeps($$){
   my ($items_ref, $format) = @_;
@@ -142,29 +221,17 @@
   
   # resolve dependencies:
   for (my $cat_item = shift @cat_items; defined $cat_item; $cat_item = shift @cat_items){
-    my $item     = $cat_item->{'item'};
-    my $category = $cat_item->{'category'};
-    if (not exists $conf->{$category}) {
-      print STDERR "$0: Warning caetgory '$category' not found in configuration. Dropping $item.\n";
-      next;
-    }
-    if (!exists $conf->{$category}{$item}){
-      print STDERR "$0: Warning: item '$item' not found in configuration. Dropping\n";
-      next;
-    }
-    $deps_map{$item}{'seen'} = 1;
-    #print STDERR "item: $item\n";
-    next unless (exists  $conf->{$category}{$item}{'Depends'});
-    my @deps = split(/[ ,]+/, $conf->{$category}{$item}{'Depends'});
-
-    foreach my $dep (@deps) {
-      #print STDERR "item: $item, dep: $dep\n";
-      # if we haven't seen it, check it recursively, just in case
-      if (! exists $deps_map{$dep}{'seen'}) {
-	my $dep_cat = $deps_map{$dep}{'category'};
-        push(@cat_items, ({'item'=>$dep, 'category'=>$dep_cat}));
-      }
-    }
+		# ignore bd data:
+		next unless (item_cat_name_check($cat_item, $conf));
+
+		# don't check what we already verified to work:
+		next if (exists $deps_map{$cat_item->{'item'}}{'seen'});
+
+		my @deps = resolve_dependencies($cat_item, $conf, \%deps_map);
+		for my $dep (@deps) { 
+			# @deps includes $item if its dependencies were satisfied:
+      $deps_map{$dep}{'seen'} = 1;
+		}
   }
 
   # collect back into a categories tree:

Modified: team/tzafrir/kernelmove_conf/configure
URL: http://svn.digium.com/view/zaptel/team/tzafrir/kernelmove_conf/configure?view=diff&rev=2803&r1=2802&r2=2803
==============================================================================
--- team/tzafrir/kernelmove_conf/configure (original)
+++ team/tzafrir/kernelmove_conf/configure Tue Jul 31 01:57:03 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 2695 .
+# From configure.ac Revision: 2705 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -674,12 +674,6 @@
 FETCH
 DOWNLOAD
 EGREP
-CURSES_LIB
-CURSES_INCLUDE
-PBX_LIBCURSES
-NCURSES_LIB
-NCURSES_INCLUDE
-PBX_LIBNCURSES
 NEWT_LIB
 NEWT_INCLUDE
 PBX_LIBNEWT
@@ -1274,8 +1268,6 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-curses=PATH      use curses files in PATH
-  --with-ncurses=PATH     use ncurses files in PATH
   --with-newt=PATH        use newt files in PATH
   --with-usb=PATH         use libusb files in PATH
   --with-modules          kernel to build. all, none, help, or comma-separated
@@ -1737,6 +1729,8 @@
      localstatedir=/var
 fi
 
+rm -f build_conf/libs
+
 # This needs to be before any macros that use the C compiler
 
 cat >>confdefs.h <<\_ACEOF
@@ -3675,838 +3669,6 @@
 
 
 
-# Check whether --with-curses was given.
-if test "${with_curses+set}" = set; then
-  withval=$with_curses;
-case ${withval} in
-     n|no)
-     USE_CURSES=no
-     ;;
-     y|ye|yes)
-     CURSES_MANDATORY="yes"
-     ;;
-     *)
-     CURSES_DIR="${withval}"
-     CURSES_MANDATORY="yes"
-     ;;
-esac
-
-fi
-
-
-PBX_LIBCURSES=0
-
-if test "${USE_CURSES}" != "no"; then
-   pbxlibdir=""
-   if test "x${CURSES_DIR}" != "x"; then
-      pbxlibdir="-L${curses_DIR}/lib"
-   fi
-   { echo "$as_me:$LINENO: checking for initscr in -lcurses" >&5
-echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6; }
-if test "${ac_cv_lib_curses_initscr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurses ${pbxlibdir}  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char initscr ();
-int
-main ()
-{
-return initscr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_curses_initscr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_curses_initscr=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_initscr" >&5
-echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6; }
-if test $ac_cv_lib_curses_initscr = yes; then
-  AST_CURSES_FOUND=yes
-else
-  AST_CURSES_FOUND=no
-fi
-
-
-   if test "${AST_CURSES_FOUND}" = "yes"; then
-      CURSES_LIB="-lcurses "
-      CURSES_HEADER_FOUND="1"
-      if test "x${CURSES_DIR}" != "x"; then
-         CURSES_LIB="${pbxlibdir} ${CURSES_LIB}"
-	 CURSES_INCLUDE="-I${CURSES_DIR}/include"
-	 if test "xcurses.h" != "x" ; then
-	    as_ac_Header=`echo "ac_cv_header_${CURSES_DIR}/include/curses.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${CURSES_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${CURSES_DIR}/include/curses.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${CURSES_DIR}/include/curses.h usability" >&5
-echo $ECHO_N "checking ${CURSES_DIR}/include/curses.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <${CURSES_DIR}/include/curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ${CURSES_DIR}/include/curses.h presence" >&5
-echo $ECHO_N "checking ${CURSES_DIR}/include/curses.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <${CURSES_DIR}/include/curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${CURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${CURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for ${CURSES_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${CURSES_DIR}/include/curses.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  CURSES_HEADER_FOUND=1
-else
-  CURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      else
-	 if test "xcurses.h" != "x" ; then
-            if test "${ac_cv_header_curses_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for curses.h" >&5
-echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking curses.h usability" >&5
-echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking curses.h presence" >&5
-echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: curses.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for curses.h" >&5
-echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_curses_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
-
-fi
-if test $ac_cv_header_curses_h = yes; then
-  CURSES_HEADER_FOUND=1
-else
-  CURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      fi
-      if test "x${CURSES_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${CURSES_MANDATORY}" ;
-         then
-            { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
-            { echo "$as_me:$LINENO: *** It appears that you do not have the curses development package installed." >&5
-echo "$as_me: *** It appears that you do not have the curses development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include curses support" >&5
-echo "$as_me: *** Please install it to include curses support" >&or re-run configure;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-curses" >&5
-echo "$as_me: *** without explicitly specifying --with-curses" >&6;}
-            exit 1
-         fi
-         CURSES_LIB=""
-         CURSES_INCLUDE=""
-         PBX_LIBCURSES=0
-      else
-         PBX_LIBCURSES=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CURSES 1
-_ACEOF
-
-      fi
-   elif test ! -z "${CURSES_MANDATORY}";
-   then
-      { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
-      { echo "$as_me:$LINENO: *** The curses installation on this system appears to be broken." >&5
-echo "$as_me: *** The curses installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
-      { echo "$as_me:$LINENO: *** without explicity specifying --with-curses" >&5
-echo "$as_me: *** without explicity specifying --with-curses" >&6;}
-      exit 1
-   fi
-fi
-
-
-
-
-
-
-# Check whether --with-ncurses was given.
-if test "${with_ncurses+set}" = set; then
-  withval=$with_ncurses;
-case ${withval} in
-     n|no)
-     USE_NCURSES=no
-     ;;
-     y|ye|yes)
-     NCURSES_MANDATORY="yes"
-     ;;
-     *)
-     NCURSES_DIR="${withval}"
-     NCURSES_MANDATORY="yes"
-     ;;
-esac
-
-fi
-
-
-PBX_LIBNCURSES=0
-
-if test "${USE_NCURSES}" != "no"; then
-   pbxlibdir=""
-   if test "x${NCURSES_DIR}" != "x"; then
-      pbxlibdir="-L${ncurses_DIR}/lib"
-   fi
-   { echo "$as_me:$LINENO: checking for initscr in -lncurses" >&5
-echo $ECHO_N "checking for initscr in -lncurses... $ECHO_C" >&6; }
-if test "${ac_cv_lib_ncurses_initscr+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lncurses ${pbxlibdir}  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char initscr ();
-int
-main ()
-{
-return initscr ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_ncurses_initscr=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ncurses_initscr=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_initscr" >&5
-echo "${ECHO_T}$ac_cv_lib_ncurses_initscr" >&6; }
-if test $ac_cv_lib_ncurses_initscr = yes; then
-  AST_NCURSES_FOUND=yes
-else
-  AST_NCURSES_FOUND=no
-fi
-
-
-   if test "${AST_NCURSES_FOUND}" = "yes"; then
-      NCURSES_LIB="-lncurses "
-      NCURSES_HEADER_FOUND="1"
-      if test "x${NCURSES_DIR}" != "x"; then
-         NCURSES_LIB="${pbxlibdir} ${NCURSES_LIB}"
-	 NCURSES_INCLUDE="-I${NCURSES_DIR}/include"
-	 if test "xcurses.h" != "x" ; then
-	    as_ac_Header=`echo "ac_cv_header_${NCURSES_DIR}/include/curses.h" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${NCURSES_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${NCURSES_DIR}/include/curses.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${NCURSES_DIR}/include/curses.h usability" >&5
-echo $ECHO_N "checking ${NCURSES_DIR}/include/curses.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <${NCURSES_DIR}/include/curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking ${NCURSES_DIR}/include/curses.h presence" >&5
-echo $ECHO_N "checking ${NCURSES_DIR}/include/curses.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <${NCURSES_DIR}/include/curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: ${NCURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: ${NCURSES_DIR}/include/curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for ${NCURSES_DIR}/include/curses.h" >&5
-echo $ECHO_N "checking for ${NCURSES_DIR}/include/curses.h... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  NCURSES_HEADER_FOUND=1
-else
-  NCURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      else
-	 if test "xcurses.h" != "x" ; then
-            if test "${ac_cv_header_curses_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for curses.h" >&5
-echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking curses.h usability" >&5
-echo $ECHO_N "checking curses.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <curses.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking curses.h presence" >&5
-echo $ECHO_N "checking curses.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <curses.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: curses.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: curses.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: curses.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: curses.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: curses.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: curses.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: curses.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: curses.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: curses.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for curses.h" >&5
-echo $ECHO_N "checking for curses.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_curses_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_curses_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_curses_h" >&5
-echo "${ECHO_T}$ac_cv_header_curses_h" >&6; }
-
-fi
-if test $ac_cv_header_curses_h = yes; then
-  NCURSES_HEADER_FOUND=1
-else
-  NCURSES_HEADER_FOUND=0
-fi
-
-
-	 fi
-      fi
-      if test "x${NCURSES_HEADER_FOUND}" = "x0" ; then
-         if test ! -z "${NCURSES_MANDATORY}" ;
-         then
-            { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
-            { echo "$as_me:$LINENO: *** It appears that you do not have the ncurses development package installed." >&5
-echo "$as_me: *** It appears that you do not have the ncurses development package installed." >&6;}
-            { echo "$as_me:$LINENO: *** Please install it to include ncurses support" >&5
-echo "$as_me: *** Please install it to include ncurses support" >&or re-run configure;}
-            { echo "$as_me:$LINENO: *** without explicitly specifying --with-ncurses" >&5
-echo "$as_me: *** without explicitly specifying --with-ncurses" >&6;}
-            exit 1
-         fi
-         NCURSES_LIB=""
-         NCURSES_INCLUDE=""
-         PBX_LIBNCURSES=0
-      else
-         PBX_LIBNCURSES=1
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_NCURSES 1
-_ACEOF
-
-      fi
-   elif test ! -z "${NCURSES_MANDATORY}";
-   then
-      { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
-      { echo "$as_me:$LINENO: *** The ncurses installation on this system appears to be broken." >&5
-echo "$as_me: *** The ncurses installation on this system appears to be broken." >&6;}
-      { echo "$as_me:$LINENO: *** Either correct the installation" >&5
-echo "$as_me: *** Either correct the installation" >&or run configure;}
-      { echo "$as_me:$LINENO: *** without explicity specifying --with-ncurses" >&5
-echo "$as_me: *** without explicity specifying --with-ncurses" >&6;}
-      exit 1
-   fi
-fi
-
-
-
-
-
-
 # Check whether --with-newt was given.
 if test "${with_newt+set}" = set; then
   withval=$with_newt;
@@ -4607,11 +3769,11 @@
       if test "x${NEWT_DIR}" != "x"; then
          NEWT_LIB="${pbxlibdir} ${NEWT_LIB}"
 	 NEWT_INCLUDE="-I${NEWT_DIR}/include"
-	 if test "xnewt.h" != "x" ; then
-	    as_ac_Header=`echo "ac_cv_header_${NEWT_DIR}/include/newt.h" | $as_tr_sh`
+	 if test "xnewt________.h" != "x" ; then
+	    as_ac_Header=`echo "ac_cv_header_${NEWT_DIR}/include/newt________.h" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for ${NEWT_DIR}/include/newt.h" >&5
-echo $ECHO_N "checking for ${NEWT_DIR}/include/newt.h... $ECHO_C" >&6; }
+  { echo "$as_me:$LINENO: checking for ${NEWT_DIR}/include/newt________.h" >&5
+echo $ECHO_N "checking for ${NEWT_DIR}/include/newt________.h... $ECHO_C" >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
@@ -4620,8 +3782,8 @@
 echo "${ECHO_T}$ac_res" >&6; }
 else
   # Is the header compilable?
-{ echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt.h usability" >&5
-echo $ECHO_N "checking ${NEWT_DIR}/include/newt.h usability... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt________.h usability" >&5
+echo $ECHO_N "checking ${NEWT_DIR}/include/newt________.h usability... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -4629,7 +3791,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <${NEWT_DIR}/include/newt.h>
+#include <${NEWT_DIR}/include/newt________.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -4661,15 +3823,15 @@
 echo "${ECHO_T}$ac_header_compiler" >&6; }
 
 # Is the header present?
-{ echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt.h presence" >&5
-echo $ECHO_N "checking ${NEWT_DIR}/include/newt.h presence... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking ${NEWT_DIR}/include/newt________.h presence" >&5
+echo $ECHO_N "checking ${NEWT_DIR}/include/newt________.h presence... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext

[... 273 lines stripped ...]



More information about the zaptel-commits mailing list