X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fconfigure;h=ec8f856a57f8cbca48dda1589caba4d12b291757;hp=f9047c5eb0b9621d91b85e54abda8b1904e18160;hb=4bbfbf869d8c913cb0f5f30708b0bcb5d1724b96;hpb=22a4b929f47f85588dc07fddf98b09776cec658f diff --git a/Ada95/configure b/Ada95/configure index f9047c5e..ec8f856a 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.66 . +# From configure.in Revision: 1.68 . # Guess values for system-dependent variables and create Makefiles. # Generated by Autoconf 2.52.20181006. # @@ -15600,14 +15600,27 @@ fi do echo "$as_me:15601: checking for gprconfig name for $cf_gprconfig" >&5 echo $ECHO_N "checking for gprconfig name for $cf_gprconfig... $ECHO_C" >&6 - cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + if test $cf_gprconfig = C + then + for cf_gprconfig_param in \ + $cf_gprconfig,,,,GNATGCC \ + $cf_gprconfig,,,,GCC \ + $cf_gprconfig + do + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + test -n "$cf_gprconfig_value" && break + done + else + cf_gprconfig_param=$cf_gprconfig + cf_gprconfig_value=`echo s| gprconfig --config=$cf_gprconfig_param 2>&5 | ${AWK:-awk} '/^\*/{print $3;}' | head -n 1` + fi if test -n "$cf_gprconfig_value" then eval cf_ada_config_$cf_gprconfig=$cf_gprconfig_value - echo "$as_me:15607: result: $cf_gprconfig_value" >&5 + echo "$as_me:15620: result: $cf_gprconfig_value" >&5 echo "${ECHO_T}$cf_gprconfig_value" >&6 else - echo "$as_me:15610: result: missing" >&5 + echo "$as_me:15623: result: missing" >&5 echo "${ECHO_T}missing" >&6 cf_ada_config="#" break @@ -15623,12 +15636,12 @@ echo "${ECHO_T}missing" >&6 if test "x$cf_ada_config" != "x#" then -echo "$as_me:15626: checking for gnat version" >&5 +echo "$as_me:15639: checking for gnat version" >&5 echo $ECHO_N "checking for gnat version... $ECHO_C" >&6 cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \ grep '[0-9].[0-9][0-9]*' |\ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'` -echo "$as_me:15631: result: $cf_gnat_version" >&5 +echo "$as_me:15644: result: $cf_gnat_version" >&5 echo "${ECHO_T}$cf_gnat_version" >&6 case $cf_gnat_version in @@ -15636,7 +15649,7 @@ case $cf_gnat_version in cf_cv_prog_gnat_correct=yes ;; (*) - { echo "$as_me:15639: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 + { echo "$as_me:15652: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5 echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;} cf_cv_prog_gnat_correct=no ;; @@ -15644,7 +15657,7 @@ esac # Extract the first word of "m4", so it can be a program name with args. set dummy m4; ac_word=$2 -echo "$as_me:15647: checking for $ac_word" >&5 +echo "$as_me:15660: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_M4_exists+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15659,7 +15672,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_M4_exists="yes" -echo "$as_me:15662: found $ac_dir/$ac_word" >&5 +echo "$as_me:15675: found $ac_dir/$ac_word" >&5 break done @@ -15668,10 +15681,10 @@ fi fi M4_exists=$ac_cv_prog_M4_exists if test -n "$M4_exists"; then - echo "$as_me:15671: result: $M4_exists" >&5 + echo "$as_me:15684: result: $M4_exists" >&5 echo "${ECHO_T}$M4_exists" >&6 else - echo "$as_me:15674: result: no" >&5 + echo "$as_me:15687: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15680,7 +15693,7 @@ fi echo Ada95 binding required program m4 not found. Ada95 binding disabled. fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:15683: checking if GNAT works" >&5 + echo "$as_me:15696: checking if GNAT works" >&5 echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6 rm -rf conftest* *~conftest* @@ -15708,7 +15721,7 @@ else fi rm -rf conftest* *~conftest* - echo "$as_me:15711: result: $cf_cv_prog_gnat_correct" >&5 + echo "$as_me:15724: result: $cf_cv_prog_gnat_correct" >&5 echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6 fi else @@ -15718,7 +15731,7 @@ fi if test "$cf_cv_prog_gnat_correct" = yes; then - echo "$as_me:15721: checking optimization options for ADAFLAGS" >&5 + echo "$as_me:15734: checking optimization options for ADAFLAGS" >&5 echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 case "$CFLAGS" in (*-g*) @@ -15735,10 +15748,10 @@ echo $ECHO_N "checking optimization options for ADAFLAGS... $ECHO_C" >&6 ;; esac - echo "$as_me:15738: result: $ADAFLAGS" >&5 + echo "$as_me:15751: result: $ADAFLAGS" >&5 echo "${ECHO_T}$ADAFLAGS" >&6 -echo "$as_me:15741: checking if GNATPREP supports -T option" >&5 +echo "$as_me:15754: checking if GNATPREP supports -T option" >&5 echo $ECHO_N "checking if GNATPREP supports -T option... $ECHO_C" >&6 if test "${cf_cv_gnatprep_opt_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15748,11 +15761,11 @@ cf_cv_gnatprep_opt_t=no gnatprep -T 2>/dev/null >/dev/null && cf_cv_gnatprep_opt_t=yes fi -echo "$as_me:15751: result: $cf_cv_gnatprep_opt_t" >&5 +echo "$as_me:15764: result: $cf_cv_gnatprep_opt_t" >&5 echo "${ECHO_T}$cf_cv_gnatprep_opt_t" >&6 test "$cf_cv_gnatprep_opt_t" = yes && GNATPREP_OPTS="-T $GNATPREP_OPTS" -echo "$as_me:15755: checking if GNAT supports generics" >&5 +echo "$as_me:15768: checking if GNAT supports generics" >&5 echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6 case $cf_gnat_version in (3.[1-9]*|[4-9].*) @@ -15762,7 +15775,7 @@ case $cf_gnat_version in cf_gnat_generics=no ;; esac -echo "$as_me:15765: result: $cf_gnat_generics" >&5 +echo "$as_me:15778: result: $cf_gnat_generics" >&5 echo "${ECHO_T}$cf_gnat_generics" >&6 if test "$cf_gnat_generics" = yes @@ -15774,7 +15787,7 @@ else cf_generic_objects= fi -echo "$as_me:15777: checking if GNAT supports SIGINT" >&5 +echo "$as_me:15790: checking if GNAT supports SIGINT" >&5 echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6 if test "${cf_cv_gnat_sigint+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15822,7 +15835,7 @@ fi rm -rf conftest* *~conftest* fi -echo "$as_me:15825: result: $cf_cv_gnat_sigint" >&5 +echo "$as_me:15838: result: $cf_cv_gnat_sigint" >&5 echo "${ECHO_T}$cf_cv_gnat_sigint" >&6 if test $cf_cv_gnat_sigint = yes ; then @@ -15835,7 +15848,7 @@ cf_gnat_libraries=no cf_gnat_projects=no if test "$enable_gnat_projects" != no ; then -echo "$as_me:15838: checking if GNAT supports project files" >&5 +echo "$as_me:15851: checking if GNAT supports project files" >&5 echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6 case $cf_gnat_version in (3.[0-9]*) @@ -15898,15 +15911,15 @@ CF_EOF esac ;; esac -echo "$as_me:15901: result: $cf_gnat_projects" >&5 +echo "$as_me:15914: result: $cf_gnat_projects" >&5 echo "${ECHO_T}$cf_gnat_projects" >&6 fi # enable_gnat_projects if test $cf_gnat_projects = yes then - echo "$as_me:15907: checking if GNAT supports libraries" >&5 + echo "$as_me:15920: checking if GNAT supports libraries" >&5 echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6 - echo "$as_me:15909: result: $cf_gnat_libraries" >&5 + echo "$as_me:15922: result: $cf_gnat_libraries" >&5 echo "${ECHO_T}$cf_gnat_libraries" >&6 fi @@ -15926,7 +15939,7 @@ else USE_GNAT_LIBRARIES="#" fi -echo "$as_me:15929: checking for ada-compiler" >&5 +echo "$as_me:15942: checking for ada-compiler" >&5 echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6 # Check whether --with-ada-compiler or --without-ada-compiler was given. @@ -15937,12 +15950,12 @@ else cf_ada_compiler=gnatmake fi; -echo "$as_me:15940: result: $cf_ada_compiler" >&5 +echo "$as_me:15953: result: $cf_ada_compiler" >&5 echo "${ECHO_T}$cf_ada_compiler" >&6 cf_ada_package=terminal_interface -echo "$as_me:15945: checking for ada-include" >&5 +echo "$as_me:15958: checking for ada-include" >&5 echo $ECHO_N "checking for ada-include... $ECHO_C" >&6 # Check whether --with-ada-include or --without-ada-include was given. @@ -15978,7 +15991,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:15981: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:15994: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -15987,10 +16000,10 @@ esac fi eval ADA_INCLUDE="$withval" -echo "$as_me:15990: result: $ADA_INCLUDE" >&5 +echo "$as_me:16003: result: $ADA_INCLUDE" >&5 echo "${ECHO_T}$ADA_INCLUDE" >&6 -echo "$as_me:15993: checking for ada-objects" >&5 +echo "$as_me:16006: checking for ada-objects" >&5 echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6 # Check whether --with-ada-objects or --without-ada-objects was given. @@ -16026,7 +16039,7 @@ case ".$withval" in withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` ;; (*) - { { echo "$as_me:16029: error: expected a pathname, not \"$withval\"" >&5 + { { echo "$as_me:16042: error: expected a pathname, not \"$withval\"" >&5 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;} { (exit 1); exit 1; }; } ;; @@ -16035,10 +16048,10 @@ esac fi eval ADA_OBJECTS="$withval" -echo "$as_me:16038: result: $ADA_OBJECTS" >&5 +echo "$as_me:16051: result: $ADA_OBJECTS" >&5 echo "${ECHO_T}$ADA_OBJECTS" >&6 -echo "$as_me:16041: checking if an Ada95 shared-library should be built" >&5 +echo "$as_me:16054: checking if an Ada95 shared-library should be built" >&5 echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6 # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given. @@ -16048,14 +16061,14 @@ if test "${with_ada_sharedlib+set}" = set; then else with_ada_sharedlib=no fi; -echo "$as_me:16051: result: $with_ada_sharedlib" >&5 +echo "$as_me:16064: result: $with_ada_sharedlib" >&5 echo "${ECHO_T}$with_ada_sharedlib" >&6 if test "x$with_ada_sharedlib" != xno then if test "x$cf_gnat_projects" != xyes then - { echo "$as_me:16058: WARNING: disabling shared-library since GNAT projects are not supported" >&5 + { echo "$as_me:16071: WARNING: disabling shared-library since GNAT projects are not supported" >&5 echo "$as_me: WARNING: disabling shared-library since GNAT projects are not supported" >&2;} with_ada_sharedlib=no fi @@ -16074,12 +16087,12 @@ then fi else - { { echo "$as_me:16077: error: No usable Ada compiler found" >&5 + { { echo "$as_me:16090: error: No usable Ada compiler found" >&5 echo "$as_me: error: No usable Ada compiler found" >&2;} { (exit 1); exit 1; }; } fi else - { { echo "$as_me:16082: error: The Ada compiler is needed for this package" >&5 + { { echo "$as_me:16095: error: The Ada compiler is needed for this package" >&5 echo "$as_me: error: The Ada compiler is needed for this package" >&2;} { (exit 1); exit 1; }; } fi @@ -16119,7 +16132,7 @@ elif test "$includedir" != "/usr/include"; then fi ### Build up pieces for makefile rules -echo "$as_me:16122: checking default library suffix" >&5 +echo "$as_me:16135: checking default library suffix" >&5 echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -16130,10 +16143,10 @@ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6 (shared) DFT_ARG_SUFFIX='' ;; esac test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}" -echo "$as_me:16133: result: $DFT_ARG_SUFFIX" >&5 +echo "$as_me:16146: result: $DFT_ARG_SUFFIX" >&5 echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6 -echo "$as_me:16136: checking default library-dependency suffix" >&5 +echo "$as_me:16149: checking default library-dependency suffix" >&5 echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 case X$DFT_LWR_MODEL in @@ -16191,10 +16204,10 @@ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6 DFT_LIB_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_LIB_SUFFIX}" DFT_DEP_SUFFIX="${LIB_SUFFIX}${EXTRA_SUFFIX}${DFT_DEP_SUFFIX}" fi -echo "$as_me:16194: result: $DFT_DEP_SUFFIX" >&5 +echo "$as_me:16207: result: $DFT_DEP_SUFFIX" >&5 echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6 -echo "$as_me:16197: checking default object directory" >&5 +echo "$as_me:16210: checking default object directory" >&5 echo $ECHO_N "checking default object directory... $ECHO_C" >&6 case $DFT_LWR_MODEL in @@ -16210,7 +16223,7 @@ echo $ECHO_N "checking default object directory... $ECHO_C" >&6 DFT_OBJ_SUBDIR='obj_s' ;; esac esac -echo "$as_me:16213: result: $DFT_OBJ_SUBDIR" >&5 +echo "$as_me:16226: result: $DFT_OBJ_SUBDIR" >&5 echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6 ### Set up low-level terminfo dependencies for makefiles. @@ -16448,7 +16461,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:16451: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:16464: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -16624,7 +16637,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:16627: error: ambiguous option: $1 + { { echo "$as_me:16640: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -16643,7 +16656,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:16646: error: unrecognized option: $1 + -*) { { echo "$as_me:16659: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -16714,7 +16727,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; - *) { { echo "$as_me:16717: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:16730: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -17064,7 +17077,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:17067: creating $ac_file" >&5 + { echo "$as_me:17080: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -17082,7 +17095,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:17085: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:17098: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17095,7 +17108,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:17098: error: cannot find input file: $f" >&5 + { { echo "$as_me:17111: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -17111,7 +17124,7 @@ cat >>$CONFIG_STATUS <<\EOF if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:17114: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:17127: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -17120,7 +17133,7 @@ $ac_seen" >&2;} fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:17123: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:17136: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -17157,7 +17170,7 @@ s,@INSTALL@,$ac_INSTALL,;t t ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:17160: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:17173: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -17168,7 +17181,7 @@ $ac_seen" >&2;} egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:17171: WARNING: Some variables may not be substituted: + { echo "$as_me:17184: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -17217,7 +17230,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:17220: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:17233: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -17228,7 +17241,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:17231: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:17244: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17241,7 +17254,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:17244: error: cannot find input file: $f" >&5 + { { echo "$as_me:17257: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -17299,7 +17312,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:17302: $ac_file is unchanged" >&5 + { echo "$as_me:17315: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \