mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r23145] HDFFV-498: Eliminate a.exe file on cygwin configurations

Browse Source 
Tested: cygwin, duck, jam, and local linux
This commit is contained in:
Allen Byrne 2013-01-09 13:47:28 -05:00
parent b4f238fbd5
commit 39e26205e1
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
configure vendored
View File

@ -1,7 +1,7 @@
#! /bin/sh #! /bin/sh
# From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest . # From configure.ac Id: configure.ac 23142 2013-01-08 02:19:17Z derobins .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for HDF5 1.9.140. # Generated by GNU Autoconf 2.69 for HDF5 1.8.11-snap7.
# #
# Report bugs to <help@hdfgroup.org>. # Report bugs to <help@hdfgroup.org>.
# #
@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package. # Identity of this package.
PACKAGE_NAME='HDF5' PACKAGE_NAME='HDF5'
PACKAGE_TARNAME='hdf5' PACKAGE_TARNAME='hdf5'
PACKAGE_VERSION='1.9.140' PACKAGE_VERSION='1.8.11-snap7'
PACKAGE_STRING='HDF5 1.9.140' PACKAGE_STRING='HDF5 1.8.11-snap7'
PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_BUGREPORT='help@hdfgroup.org'
PACKAGE_URL='' PACKAGE_URL=''
@ -1484,7 +1484,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures HDF5 1.9.140 to adapt to many kinds of systems. \`configure' configures HDF5 1.8.11-snap7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1554,7 +1554,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of HDF5 1.9.140:";; short | recursive ) echo "Configuration of HDF5 1.8.11-snap7:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1750,7 +1750,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
HDF5 configure 1.9.140 HDF5 configure 1.8.11-snap7
generated by GNU Autoconf 2.69 generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc. Copyright (C) 2012 Free Software Foundation, Inc.
@ -2844,7 +2844,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by HDF5 $as_me 1.9.140, which was It was created by HDF5 $as_me 1.8.11-snap7, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@ $ $0 $@
@ -3676,7 +3676,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='hdf5' PACKAGE='hdf5'
VERSION='1.9.140' VERSION='1.8.11-snap7'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -27160,19 +27160,12 @@ if ${hdf5_cv_lone_colon+:} false; then :
else else
echo "int main(int argc, char * argv) {return 0;}" > conftest.c echo "int main(int argc, char * argv) {return 0;}" > conftest.c
$CC $CFLAGS conftest.c > /dev/null 2> /dev/null $CC $CFLAGS conftest.c -o a.out> /dev/null 2> /dev/null
case "`uname`" in echo "./a.out :" > conftest.sh
CYGWIN*)
echo "./a.exe :" > conftest.sh
;;
*)
echo "./a.out :" > conftest.sh
;;
esac
chmod 700 conftest.sh chmod 700 conftest.sh
./conftest.sh 2> conftest.out ./conftest.sh 2> conftest.out
rm -f a.out a.exe rm -f a.out
TEST_OUTPUT=`cat conftest.out` TEST_OUTPUT=`cat conftest.out`
if test "X$TEST_OUTPUT" = "X"; then if test "X$TEST_OUTPUT" = "X"; then
@ -31730,7 +31723,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by HDF5 $as_me 1.9.140, which was This file was extended by HDF5 $as_me 1.8.11-snap7, which was
generated by GNU Autoconf 2.69. Invocation command line was generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -31796,7 +31789,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\ ac_cs_version="\\
HDF5 config.status 1.9.140 HDF5 config.status 1.8.11-snap7
configured by $0, generated by GNU Autoconf 2.69, configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\" with options \\"\$ac_cs_config\\"
@ -34569,7 +34562,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>." Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\ lt_cl_version="\
HDF5 config.lt 1.9.140 HDF5 config.lt 1.8.11-snap7
configured by $0, generated by GNU Autoconf 2.69. configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc. Copyright (C) 2011 Free Software Foundation, Inc.

17
configure.ac
View File

@ -16,7 +16,7 @@
## ---------------------------------------------------------------------- ## ----------------------------------------------------------------------
## Initialize configure. ## Initialize configure.
## ##
AC_REVISION($Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest $) AC_REVISION($Id: configure.ac 23142 2013-01-08 02:19:17Z derobins $)
AC_PREREQ([2.69]) AC_PREREQ([2.69])
## AC_INIT takes the name of the package, the version number, and an ## AC_INIT takes the name of the package, the version number, and an
@ -26,7 +26,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a ## NOTE: Do not forget to change the version number here when we do a
## release!!! ## release!!!
## ##
AC_INIT([HDF5], [1.9.140], [help@hdfgroup.org]) AC_INIT([HDF5], [1.8.11-snap7], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADER([src/H5config.h]) AC_CONFIG_HEADER([src/H5config.h])
@ -2238,19 +2238,12 @@ AC_CACHE_CHECK([if lone colon can be used as an argument],
[hdf5_cv_lone_colon], [hdf5_cv_lone_colon],
[ [
echo "int main(int argc, char * argv[]) {return 0;}" > conftest.c echo "int main(int argc, char * argv[]) {return 0;}" > conftest.c
$CC $CFLAGS conftest.c > /dev/null 2> /dev/null $CC $CFLAGS conftest.c -o a.out> /dev/null 2> /dev/null
case "`uname`" in echo "./a.out :" > conftest.sh
CYGWIN*)
echo "./a.exe :" > conftest.sh
;;
*)
echo "./a.out :" > conftest.sh
;;
esac
chmod 700 conftest.sh chmod 700 conftest.sh
./conftest.sh 2> conftest.out ./conftest.sh 2> conftest.out
rm -f a.out a.exe rm -f a.out
TEST_OUTPUT=`cat conftest.out` TEST_OUTPUT=`cat conftest.out`
if test "X$TEST_OUTPUT" = "X"; then if test "X$TEST_OUTPUT" = "X"; then