[svn-r30170] HDFFV-9946: condense cygwin autotools config files to a single file. Avoid getpwuid function for cygwin.

5 files changed, 31 insertions, 244 deletions

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 09f1caf..606fae9 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -3,7 +3,6 @@
 #-----------------------------------------------------------------------------
 set (HDF_PREFIX "H5")
 include (${HDF_RESOURCES_EXT_DIR}/ConfigureChecks.cmake)
-include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
 
 #-----------------------------------------------------------------------------
 # Option to Clear File Buffers before write --enable-clear-file-buffers
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index c4fabf1..9589295 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -484,6 +484,13 @@ if (NOT WINDOWS)
   endif (NOT CYGWIN AND NOT MINGW)
   CHECK_SYMBOL_EXISTS (TIOCGWINSZ "sys/ioctl.h" ${HDF_PREFIX}_HAVE_TIOCGWINSZ)
   CHECK_SYMBOL_EXISTS (TIOCGETD   "sys/ioctl.h" ${HDF_PREFIX}_HAVE_TIOCGETD)
+
+  # ----------------------------------------------------------------------
+  # cygwin user credentials are different then on linux
+  #
+  if (NOT CYGWIN AND NOT MINGW)
+    CHECK_FUNCTION_EXISTS (getpwuid        ${HDF_PREFIX}_HAVE_GETPWUID)
+  endif (NOT CYGWIN AND NOT MINGW)
 endif (NOT WINDOWS)
 
 #-----------------------------------------------------------------------------
@@ -495,7 +502,6 @@ CHECK_FUNCTION_EXISTS (frexpf            ${HDF_PREFIX}_HAVE_FREXPF)
 CHECK_FUNCTION_EXISTS (frexpl            ${HDF_PREFIX}_HAVE_FREXPL)
 
 CHECK_FUNCTION_EXISTS (gethostname       ${HDF_PREFIX}_HAVE_GETHOSTNAME)
-CHECK_FUNCTION_EXISTS (getpwuid          ${HDF_PREFIX}_HAVE_GETPWUID)
 CHECK_FUNCTION_EXISTS (getrusage         ${HDF_PREFIX}_HAVE_GETRUSAGE)
 CHECK_FUNCTION_EXISTS (lstat             ${HDF_PREFIX}_HAVE_LSTAT)
 
diff --git a/config/cygwin b/config/cygwin
new file mode 100644
index 0000000..7423403
--- /dev/null
+++ b/config/cygwin
@@ -0,0 +1,24 @@
+#              -*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+#
+# See BlankForm in this directory for details.
+
+# Use the linux-gnulibc1 file.
+. $srcdir/config/linux-gnulibc1
diff --git a/config/i686-pc-cygwin b/config/i686-pc-cygwin
deleted file mode 100644
index 9b1ab74..0000000
--- a/config/i686-pc-cygwin
+++ /dev/null
@@ -1,121 +0,0 @@
-#              -*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# The default compiler is `gcc'.
-if test -z "$CC"; then
-   CC=gcc
-   CC_BASENAME=gcc
-fi
-
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out Intel C compiler flags
-. $srcdir/config/intel-flags
-
-# The default Fortran 90 compiler
-if test "X-" = "X-$FC"; then
-    case $CC_BASENAME in
-        gcc*)
-            FC=gfortran
-            FCLIBS=-lgcc
-            FC_BASENAME=gfortran
-            ;;
-        pgcc*)
-            FC=pgf90
-            FC_BASENAME=pgf90
-            ;;
-        icc*)
-            FC=ifort
-            FC_BASENAME=ifort
-            ;;
-        mpicc*)
-            FC=mpif90
-            FC_BASENAME=mpif90
-            ;;
-    esac
-else
-    case $FC in
-        # The PGI and Intel compilers are automatically detected below
-        ifc*|ifort*|pgf90*)
-            ;;
-        gfortran)
-            FCLIBS=-lgcc
-            ;;
-        g95)
-            FCLIBS=-lgcc
-            ;;
-        *)
-            # Figure out which compiler we are using: pgf90 or Absoft f95
-            RM='rm -f'
-            tmpfile=/tmp/cmpver.$$
-            $FC -V >$tmpfile
-            if test -s "$tmpfile"; then 
-                if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    FC_BASENAME=f95
-                fi 
-                if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    FC_BASENAME=pgf90
-                fi 
-            fi
-            $RM $tmpfile
-            ;;
-    esac
-fi
-
-# Figure out PGI F90 compiler flags
-. $srcdir/config/pgi-fflags
-
-# Figure out Intel F90 compiler flags
-. $srcdir/config/intel-fflags
-
-case $FC_BASENAME in
-    #
-    # Absoft compiler
-    #
-    f95)
-        # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT" 
-
-        F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
-# (just in case since this should be a default EIP)
-        H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
-        FSEARCH_DIRS=""
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g -pg"
-        f9x_flags_set=yes
-        ;;
-
-esac  
-
-# The default C++ compiler
-
-# The default compiler is `g++'.
-if test -z "$CXX"; then
-  CXX=g++
-  CXX_BASENAME=g++
-fi
diff --git a/config/x86_64-pc-cygwin b/config/x86_64-pc-cygwin
deleted file mode 100644
index 9b1ab74..0000000
--- a/config/x86_64-pc-cygwin
+++ /dev/null
@@ -1,121 +0,0 @@
-#              -*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# Copyright by the Board of Trustees of the University of Illinois.
-# All rights reserved.
-#
-# This file is part of HDF5.  The full HDF5 copyright notice, including
-# terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
-
-
-# This file is part of the HDF5 build script.  It is processed shortly
-# after configure starts and defines, among other things, flags for
-# the various compile modes.
-#
-# See BlankForm in this directory for details.
-
-# The default compiler is `gcc'.
-if test -z "$CC"; then
-   CC=gcc
-   CC_BASENAME=gcc
-fi
-
-# Figure out GNU C compiler flags
-. $srcdir/config/gnu-flags
-
-# Figure out PGI C compiler flags
-. $srcdir/config/pgi-flags
-
-# Figure out Intel C compiler flags
-. $srcdir/config/intel-flags
-
-# The default Fortran 90 compiler
-if test "X-" = "X-$FC"; then
-    case $CC_BASENAME in
-        gcc*)
-            FC=gfortran
-            FCLIBS=-lgcc
-            FC_BASENAME=gfortran
-            ;;
-        pgcc*)
-            FC=pgf90
-            FC_BASENAME=pgf90
-            ;;
-        icc*)
-            FC=ifort
-            FC_BASENAME=ifort
-            ;;
-        mpicc*)
-            FC=mpif90
-            FC_BASENAME=mpif90
-            ;;
-    esac
-else
-    case $FC in
-        # The PGI and Intel compilers are automatically detected below
-        ifc*|ifort*|pgf90*)
-            ;;
-        gfortran)
-            FCLIBS=-lgcc
-            ;;
-        g95)
-            FCLIBS=-lgcc
-            ;;
-        *)
-            # Figure out which compiler we are using: pgf90 or Absoft f95
-            RM='rm -f'
-            tmpfile=/tmp/cmpver.$$
-            $FC -V >$tmpfile
-            if test -s "$tmpfile"; then 
-                if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    FC_BASENAME=f95
-                fi 
-                if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    FC_BASENAME=pgf90
-                fi 
-            fi
-            $RM $tmpfile
-            ;;
-    esac
-fi
-
-# Figure out PGI F90 compiler flags
-. $srcdir/config/pgi-fflags
-
-# Figure out Intel F90 compiler flags
-. $srcdir/config/intel-fflags
-
-case $FC_BASENAME in
-    #
-    # Absoft compiler
-    #
-    f95)
-        # Set required flag for compiling C stubs
-        H5_CFLAGS="$H5_CFLAGS -DH5_ABSOFT" 
-
-        F9XSUFFIXFLAG=""
-# We force compiler to use upper case for external names 
-# (just in case since this should be a default EIP)
-        H5_FCFLAGS="$H5_FCFLAGS -YEXT_NAMES=UCS"
-        FSEARCH_DIRS=""
-        DEBUG_FCFLAGS="-g"
-        PROD_FCFLAGS="-O"
-        PROFILE_FCFLAGS="-g -pg"
-        f9x_flags_set=yes
-        ;;
-
-esac  
-
-# The default C++ compiler
-
-# The default compiler is `g++'.
-if test -z "$CXX"; then
-  CXX=g++
-  CXX_BASENAME=g++
-fi