From 14bb21fe45326a3397c3b1983ea0a0477044580e Mon Sep 17 00:00:00 2001 From: Keith Marshall Date: Sat, 10 Dec 2011 21:43:09 +0000 Subject: Correct defective configure checkin --- winsup/w32api/configure | 231 +----------------------------------------------- 1 file changed, 2 insertions(+), 229 deletions(-) (limited to 'winsup/w32api') diff --git a/winsup/w32api/configure b/winsup/w32api/configure index b89393266..234c10f1b 100755 --- a/winsup/w32api/configure +++ b/winsup/w32api/configure @@ -560,12 +560,6 @@ ac_unique_file="include/w32api.h" ac_subst_vars='LTLIBOBJS LIBOBJS BUILDENV -DEVTAG -SUBSYSTEM -TAREXT -ZIPCMD -TARCMD -LN_S LD WINDRES DLLTOOL @@ -578,7 +572,6 @@ CC INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -MKDIR_P target_os target_vendor target_cpu @@ -591,7 +584,6 @@ build_os build_vendor build_cpu build -PACKAGE_RELEASE target_alias host_alias build_alias @@ -636,8 +628,7 @@ enable_option_checking ' ac_precious_vars='build_alias host_alias -target_alias -PACKAGE_RELEASE' +target_alias' # Initialize some variables set by options. @@ -1250,13 +1241,6 @@ if test -n "$ac_init_help"; then esac cat <<\_ACEOF -Some influential environment variables: - PACKAGE_RELEASE - release number suffix, qualifying package version - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - Report bugs to . _ACEOF ac_status=$? @@ -1692,10 +1676,6 @@ $as_echo_n "checking package version... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PACKAGE_VERSION" >&5 $as_echo "$PACKAGE_VERSION" >&6; } -PACKAGE_RELEASE=${PACKAGE_RELEASE-"1"} - - - ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -1837,50 +1817,6 @@ test -n "$target_alias" && program_prefix=${target_alias}- -# Identify commands which are to be used for installation. -# -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done - done -IFS=$as_save_IFS - -fi - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } - # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -2640,159 +2576,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - - -# Establish how to create and identify package tarballs. -# -# Extract the first word of "tar", so it can be a program name with args. -set dummy tar; 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_TARCMD+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$TARCMD"; then - ac_cv_prog_TARCMD="$TARCMD" # Let the user override the test. -else -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_prog_TARCMD="tar" - $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 - -fi -fi -TARCMD=$ac_cv_prog_TARCMD -if test -n "$TARCMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TARCMD" >&5 -$as_echo "$TARCMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -case $target_os in #( - *cygwin*) : - # Extract the first word of "bzip2", so it can be a program name with args. -set dummy bzip2; 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_ZIPCMD+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ZIPCMD"; then - ac_cv_prog_ZIPCMD="$ZIPCMD" # Let the user override the test. -else -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_prog_ZIPCMD="bzip2" - $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 - - test -z "$ac_cv_prog_ZIPCMD" && ac_cv_prog_ZIPCMD="gzip" -fi -fi -ZIPCMD=$ac_cv_prog_ZIPCMD -if test -n "$ZIPCMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIPCMD" >&5 -$as_echo "$ZIPCMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - ;; #( - *) : - # Extract the first word of "lzma", so it can be a program name with args. -set dummy lzma; 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_ZIPCMD+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ZIPCMD"; then - ac_cv_prog_ZIPCMD="$ZIPCMD" # Let the user override the test. -else -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_prog_ZIPCMD="lzma" - $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 - - test -z "$ac_cv_prog_ZIPCMD" && ac_cv_prog_ZIPCMD="gzip" -fi -fi -ZIPCMD=$ac_cv_prog_ZIPCMD -if test -n "$ZIPCMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIPCMD" >&5 -$as_echo "$ZIPCMD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - ;; -esac -case $ZIPCMD in #( - b*) : - TAREXT=tar.bz2 - ;; #( - l*) : - TAREXT=tar.lzma - ;; #( - *) : - TAREXT=tar.gz - - ;; -esac -case $target_os in #( - *cygwin*) : - SUBSYSTEM="" DEVTAG="" ;; #( - *) : - SUBSYSTEM="-$host_os" DEVTAG="-dev" - ;; -esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build environment" >&5 $as_echo_n "checking for build environment... " >&6; } @@ -2809,9 +2592,7 @@ $as_echo "$BUILDENV" >&6; } fi -ac_config_files="$ac_config_files Makefile Makefile.comm" - -ac_config_files="$ac_config_files lib/Makefile lib/ddk/Makefile lib/directx/Makefile" +ac_config_files="$ac_config_files Makefile lib/Makefile lib/ddk/Makefile lib/directx/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -3419,7 +3200,6 @@ gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' -MKDIR_P='$MKDIR_P' test -n "\$AWK" || AWK=awk _ACEOF @@ -3521,7 +3301,6 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "Makefile.comm") CONFIG_FILES="$CONFIG_FILES Makefile.comm" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/ddk/Makefile") CONFIG_FILES="$CONFIG_FILES lib/ddk/Makefile" ;; "lib/directx/Makefile") CONFIG_FILES="$CONFIG_FILES lib/directx/Makefile" ;; @@ -3861,11 +3640,6 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac - ac_MKDIR_P=$MKDIR_P - case $MKDIR_P in - [\\/$]* | ?:[\\/]* ) ;; - */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; - esac _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -3920,7 +3694,6 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t -s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -- cgit v1.2.3