directory 1.2.0.1 → 1.2.1.0
raw patch · 11 files changed
+1132/−842 lines, 11 filesdep ~Win32dep ~basedep ~filepathnew-uploaderPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: Win32, base, filepath, time, unix
API changes (from Hackage documentation)
+ System.Directory: findFiles :: [FilePath] -> String -> IO [FilePath]
+ System.Directory: findFilesWith :: (FilePath -> IO Bool) -> [FilePath] -> String -> IO [FilePath]
Files
- System/Directory.hs +129/−118
- cbits/directory.c +1/−1
- changelog.md +21/−0
- config.guess +337/−279
- config.sub +287/−104
- configure +162/−135
- directory.buildinfo +1/−0
- directory.cabal +57/−34
- include/HsDirectory.h +1/−5
- include/HsDirectoryConfig.h +0/−50
- install-sh +136/−116
System/Directory.hs view
@@ -1,6 +1,5 @@-{-# OPTIONS_GHC -w #-}--- XXX We get some warnings on Windows-#if __GLASGOW_HASKELL__ >= 701+{-# LANGUAGE CPP, NondecreasingIndentation #-}+#ifdef __GLASGOW_HASKELL__ {-# LANGUAGE Trustworthy #-} #endif @@ -9,7 +8,7 @@ -- Module : System.Directory -- Copyright : (c) The University of Glasgow 2001 -- License : BSD-style (see the file libraries/base/LICENSE)--- +-- -- Maintainer : libraries@haskell.org -- Stability : stable -- Portability : portable@@ -18,15 +17,13 @@ -- ----------------------------------------------------------------------------- -module System.Directory - ( +module System.Directory+ ( -- $intro -- * Actions on directories createDirectory-#ifndef __NHC__ , createDirectoryIfMissing-#endif , removeDirectory , removeDirectoryRecursive , renameDirectory@@ -45,11 +42,13 @@ , removeFile , renameFile , copyFile- + , canonicalizePath , makeRelativeToCurrentDirectory , findExecutable , findFile+ , findFiles+ , findFilesWith -- * Existence tests , doesFileExist@@ -79,21 +78,12 @@ , getModificationTime ) where -import Control.Monad (guard)-import System.Environment ( getEnv ) import System.FilePath import System.IO import System.IO.Error import Control.Monad ( when, unless ) import Control.Exception.Base as E -#ifdef __NHC__-import Directory -- hiding ( getDirectoryContents- -- , doesDirectoryExist, doesFileExist- -- , getModificationTime )-import System (system)-#endif /* __NHC__ */- #ifdef __HUGS__ import Hugs.Directory #endif /* __HUGS__ */@@ -103,42 +93,26 @@ {-# CFILES cbits/directory.c #-} +import Data.Maybe+ import Data.Time import Data.Time.Clock.POSIX #ifdef __GLASGOW_HASKELL__ -#if __GLASGOW_HASKELL__ >= 611-import GHC.IO.Exception ( IOException(..), IOErrorType(..), ioException )-#else-import GHC.IOBase ( IOException(..), IOErrorType(..), ioException )-#endif--#if __GLASGOW_HASKELL__ > 700-import GHC.IO.Encoding-import GHC.Foreign as GHC-#endif+import GHC.IO.Exception ( IOErrorType(InappropriateType) ) #ifdef mingw32_HOST_OS import System.Posix.Types import System.Posix.Internals import qualified System.Win32 as Win32 #else+import GHC.IO.Encoding+import GHC.Foreign as GHC+import System.Environment ( getEnv ) import qualified System.Posix as Posix #endif -#if __GLASGOW_HASKELL__ == 702--- fileSystemEncoding exists only in base-4.4-getFileSystemEncoding :: IO TextEncoding-getFileSystemEncoding = return fileSystemEncoding-#endif--#if __GLASGOW_HASKELL__ < 702--- just like in base >= 4.4-catchIOError :: IO a -> (IOError -> IO a) -> IO a-catchIOError = E.catch-#endif- #endif /* __GLASGOW_HASKELL__ */ {- $intro@@ -146,7 +120,7 @@ reference to a file system object (file, directory etc.). Some entries may be hidden, inaccessible, or have some administrative function (e.g. `.' or `..' under POSIX-<http://www.opengroup.org/onlinepubs/009695399/>), but in +<http://www.opengroup.org/onlinepubs/009695399/>), but in this standard all such entries are considered to form part of the directory contents. Entries in sub-directories are not, however, considered to form part of the directory contents.@@ -168,10 +142,10 @@ files and directories. For directories, the executable field will be 'False', and for files the searchable field will be 'False'. Note that directories may be searchable without being readable, if permission has- been given to use them as part of a path, but not to examine the + been given to use them as part of a path, but not to examine the directory contents. -Note that to change some, but not all permissions, a construct on the following lines must be used. +Note that to change some, but not all permissions, a construct on the following lines must be used. > makeReadable f = do > p <- getPermissions f@@ -181,8 +155,8 @@ data Permissions = Permissions {- readable, writable, - executable, searchable :: Bool + readable, writable,+ executable, searchable :: Bool } deriving (Eq, Ord, Read, Show) emptyPermissions :: Permissions@@ -277,8 +251,10 @@ #ifdef mingw32_HOST_OS allocaBytes sizeof_stat $ \ p_stat -> do withFilePath name $ \p_name -> do- throwErrnoIfMinus1_ "setPermissions" $ do+ throwErrnoIfMinus1_ "setPermissions" $ c_stat p_name p_stat++ throwErrnoIfMinus1_ "setPermissions" $ do mode <- st_mode p_stat let mode1 = modifyBit r mode s_IRUSR let mode2 = modifyBit w mode1 s_IWUSR@@ -335,7 +311,7 @@ @[EROFS, EACCES]@ * 'isAlreadyExistsError' \/ 'AlreadyExists'-The operand refers to a directory that already exists. +The operand refers to a directory that already exists. @ [EEXIST]@ * 'HardwareFault'@@ -347,7 +323,7 @@ @[ENAMETOOLONG, ELOOP]@ * 'NoSuchThing'-There is no path to the directory. +There is no path to the directory. @[ENOENT, ENOTDIR]@ * 'ResourceExhausted'@@ -377,8 +353,7 @@ #endif -#ifndef __NHC__--- | @'createDirectoryIfMissing' parents dir@ creates a new directory +-- | @'createDirectoryIfMissing' parents dir@ creates a new directory -- @dir@ if it doesn\'t exist. If the first argument is 'True' -- the function will also create all parent directories if they are missing. createDirectoryIfMissing :: Bool -- ^ Create its parents too?@@ -411,7 +386,14 @@ -- the case that the dir did exist but another process deletes the -- directory and creates a file in its place before we can check -- that the directory did indeed exist.- | isAlreadyExistsError e -> (do+ -- We also follow this path when we get a permissions error, as+ -- trying to create "." when in the root directory on Windows+ -- fails with+ -- CreateDirectory ".": permission denied (Access is denied.)+ -- This caused GHCi to crash when loading a module in the root+ -- directory.+ | isAlreadyExistsError e+ || isPermissionError e -> (do #ifdef mingw32_HOST_OS withFileStatus "createDirectoryIfMissing" dir $ \st -> do isDir <- isDirectory st@@ -425,7 +407,6 @@ #endif ) `E.catch` ((\_ -> return ()) :: IOException -> IO ()) | otherwise -> throw e-#endif /* !__NHC__ */ #if __GLASGOW_HASKELL__ {- | @'removeDirectory' dir@ removes an existing directory /dir/. The@@ -441,14 +422,14 @@ * 'HardwareFault' A physical I\/O error has occurred.-EIO+@[EIO]@ * 'InvalidArgument' The operand is not a valid directory name.-[ENAMETOOLONG, ELOOP]+@[ENAMETOOLONG, ELOOP]@ * 'isDoesNotExistError' \/ 'NoSuchThing'-The directory does not exist. +The directory does not exist. @[ENOENT, ENOTDIR]@ * 'isPermissionError' \/ 'PermissionDenied'@@ -456,7 +437,7 @@ @[EROFS, EACCES, EPERM]@ * 'UnsatisfiedConstraints'-Implementation-dependent constraints are not satisfied. +Implementation-dependent constraints are not satisfied. @[EBUSY, ENOTEMPTY, EEXIST]@ * 'UnsupportedOperation'@@ -480,7 +461,7 @@ #endif -- | @'removeDirectoryRecursive' dir@ removes an existing directory /dir/--- together with its content and all subdirectories. Be careful, +-- together with its content and all subdirectories. Be careful, -- if the directory contains symlinks, the function will follow them. removeDirectoryRecursive :: FilePath -> IO () removeDirectoryRecursive startLoc = do@@ -515,7 +496,7 @@ @[ENAMETOOLONG, ELOOP]@ * 'isDoesNotExistError' \/ 'NoSuchThing'-The file does not exist. +The file does not exist. @[ENOENT, ENOTDIR]@ * 'isPermissionError' \/ 'PermissionDenied'@@ -523,7 +504,7 @@ @[EROFS, EACCES, EPERM]@ * 'UnsatisfiedConstraints'-Implementation-dependent constraints are not satisfied. +Implementation-dependent constraints are not satisfied. @[EBUSY]@ * 'InappropriateType'@@ -572,7 +553,7 @@ @[EROFS, EACCES, EPERM]@ * 'ResourceExhausted'-Insufficient resources are available to perform the operation. +Insufficient resources are available to perform the operation. @[EDQUOT, ENOSPC, ENOMEM, EMLINK]@ * 'UnsatisfiedConstraints'@@ -601,7 +582,7 @@ let is_dir = Posix.fileMode stat .&. Posix.directoryMode /= 0 #endif if (not is_dir)- then ioException (ioeSetErrorString+ then ioError (ioeSetErrorString (mkIOError InappropriateType "renameDirectory" Nothing (Just opath)) "not a directory") else do@@ -638,7 +619,7 @@ @[EROFS, EACCES, EPERM]@ * 'ResourceExhausted'-Insufficient resources are available to perform the operation. +Insufficient resources are available to perform the operation. @[EDQUOT, ENOSPC, ENOMEM, EMLINK]@ * 'UnsatisfiedConstraints'@@ -667,7 +648,7 @@ let is_dir = Posix.isDirectory stat #endif if is_dir- then ioException (ioeSetErrorString+ then ioError (ioeSetErrorString (mkIOError InappropriateType "renameFile" Nothing (Just opath)) "is a directory") else do@@ -686,13 +667,7 @@ -} copyFile :: FilePath -> FilePath -> IO ()-#ifdef __NHC__ copyFile fromFPath toFPath =- do readFile fromFPath >>= writeFile toFPath- catchIOError (copyPermissions fromFPath toFPath)- (\_ -> return ())-#else-copyFile fromFPath toFPath = copy `catchIOError` (\exc -> throw $ ioeSetLocation exc "copyFile") where copy = bracket (openBinaryFile fromFPath ReadMode) hClose $ \hFrom -> bracketOnError openTmp cleanTmp $ \(tmpFPath, hTmp) ->@@ -713,33 +688,34 @@ copyContents hFrom hTo buffer ignoreIOExceptions io = io `catchIOError` (\_ -> return ())-#endif --- | Given path referring to a file or directory, returns a--- canonicalized path, with the intent that two paths referring+-- | Given a path referring to a file or directory, returns a+-- canonicalized path. The intent is that two paths referring -- to the same file\/directory will map to the same canonicalized--- path. Note that it is impossible to guarantee that the+-- path.+--+-- Note that it is impossible to guarantee that the -- implication (same file\/dir \<=\> same canonicalizedPath) holds -- in either direction: this function can make only a best-effort -- attempt.+--+-- The precise behaviour is that of the C realpath function+-- GetFullPathNameW on Windows). In particular, the behaviour+-- on paths that do not exist is known to vary from platform+-- to platform. Some platforms do not alter the input, some+-- do, and on some an exception will be thrown. canonicalizePath :: FilePath -> IO FilePath canonicalizePath fpath = #if defined(mingw32_HOST_OS) do path <- Win32.getFullPathName fpath #else-#if __GLASGOW_HASKELL__ > 700 do enc <- getFileSystemEncoding GHC.withCString enc fpath $ \pInPath -> allocaBytes long_path_size $ \pOutPath ->- do throwErrnoPathIfNull "canonicalizePath" fpath $ c_realpath pInPath pOutPath+ do _ <- throwErrnoPathIfNull "canonicalizePath" fpath $ c_realpath pInPath pOutPath+ -- NB: pOutPath will be passed thru as result pointer by c_realpath path <- GHC.peekCString enc pOutPath-#else- withCString fpath $ \pInPath ->- allocaBytes long_path_size $ \pOutPath ->- do throwErrnoPathIfNull "canonicalizePath" fpath $ c_realpath pInPath pOutPath- path <- peekCString pOutPath #endif-#endif return (normalise path) -- normalise does more stuff, like upper-casing the drive letter @@ -772,34 +748,63 @@ -- but notably includes the directory containing the current -- executable. See -- <http://msdn.microsoft.com/en-us/library/aa365527.aspx> for more--- details. +-- details. -- findExecutable :: String -> IO (Maybe FilePath)-findExecutable binary =+findExecutable fileName = do+ files <- findExecutables fileName+ return $ listToMaybe files++-- | Given a file name, searches for the file and returns a list of all+-- occurences that are executable.+--+-- /Since: 1.2.1.0/+findExecutables :: String -> IO [FilePath]+findExecutables binary = do #if defined(mingw32_HOST_OS)- Win32.searchPath Nothing binary ('.':exeExtension)+ file <- Win32.searchPath Nothing binary ('.':exeExtension)+ return $ maybeToList file #else- do- path <- getEnv "PATH"- findFile (splitSearchPath path) (binary <.> exeExtension)+ path <- getEnv "PATH"+ findFilesWith isExecutable (splitSearchPath path) (binary <.> exeExtension)+ where isExecutable file = do+ perms <- getPermissions file+ return $ executable perms #endif -- | Search through the given set of directories for the given file. -- Used by 'findExecutable' on non-windows platforms. findFile :: [FilePath] -> String -> IO (Maybe FilePath)-findFile paths fileName = search paths- where- search :: [FilePath] -> IO (Maybe FilePath)- search [] = return Nothing- search (d:ds) = do- let path = d </> fileName- b <- doesFileExist path- if b then return (Just path)- else search ds+findFile path fileName = do+ files <- findFiles path fileName+ return $ listToMaybe files +-- | Search through the given set of directories for the given file and+-- returns a list of paths where the given file exists.+--+-- /Since: 1.2.1.0/+findFiles :: [FilePath] -> String -> IO [FilePath]+findFiles = findFilesWith (\_ -> return True)++-- | Search through the given set of directories for the given file and+-- with the given property (usually permissions) and returns a list of+-- paths where the given file exists and has the property.+--+-- /Since: 1.2.1.0/+findFilesWith :: (FilePath -> IO Bool) -> [FilePath] -> String -> IO [FilePath]+findFilesWith _ [] _ = return []+findFilesWith f (d:ds) fileName = do+ let file = d </> fileName+ exist <- doesFileExist file+ b <- if exist then f file else return False+ if b then do+ files <- findFilesWith f ds fileName+ return $ file : files+ else findFilesWith f ds fileName+ #ifdef __GLASGOW_HASKELL__ {- |@'getDirectoryContents' dir@ returns a list of /all/ entries-in /dir/. +in /dir/. The operation may fail with: @@ -831,7 +836,7 @@ getDirectoryContents :: FilePath -> IO [FilePath] getDirectoryContents path =- modifyIOError ((`ioeSetFileName` path) . + modifyIOError ((`ioeSetFileName` path) . (`ioeSetLocation` "getDirectoryContents")) $ do #ifndef mingw32_HOST_OS bracket@@ -953,7 +958,8 @@ #ifdef __GLASGOW_HASKELL__ {- |The operation 'doesDirectoryExist' returns 'True' if the argument file-exists and is a directory, and 'False' otherwise.+exists and is either a directory or a symbolic link to a directory,+and 'False' otherwise. -} doesDirectoryExist :: FilePath -> IO Bool@@ -990,20 +996,28 @@ * 'isDoesNotExistError' if the file or directory does not exist. +Note: When linked against @unix-2.6.0.0@ or later the reported time+supports sub-second precision if provided by the underlying system+call.+ -} getModificationTime :: FilePath -> IO UTCTime getModificationTime name = do #ifdef mingw32_HOST_OS- -- ToDo: use Win32 API+ -- ToDo: use Win32 API so we can get sub-second resolution withFileStatus "getModificationTime" name $ \ st -> do modificationTime st #else stat <- Posix.getFileStatus name- let mod_time :: Posix.EpochTime- mod_time = Posix.modificationTime stat- return $ posixSecondsToUTCTime $ realToFrac mod_time+ let mod_time :: POSIXTime+#if MIN_VERSION_unix(2,6,0)+ mod_time = Posix.modificationTimeHiRes stat+#else+ mod_time = realToFrac $ Posix.modificationTime stat #endif+ return $ posixSecondsToUTCTime mod_time+#endif #endif /* __GLASGOW_HASKELL__ */ @@ -1044,7 +1058,7 @@ foreign import ccall unsafe "__hscore_S_IFDIR" s_IFDIR :: CMode #endif -+#ifndef mingw32_HOST_OS #ifdef __GLASGOW_HASKELL__ foreign import ccall unsafe "__hscore_long_path_size" long_path_size :: Int@@ -1052,6 +1066,7 @@ long_path_size :: Int long_path_size = 2048 -- // guess? #endif /* __GLASGOW_HASKELL__ */+#endif /* !mingw32_HOST_OS */ {- | Returns the current user's home directory. @@ -1062,8 +1077,8 @@ On Unix, 'getHomeDirectory' returns the value of the @HOME@ environment variable. On Windows, the system is queried for a-suitable path; a typical path might be -@C:/Documents And Settings/user@.+suitable path; a typical path might be+@C:\/Documents And Settings\/user@. The operation may fail with: @@ -1104,7 +1119,7 @@ writable. On Unix, this function returns @$HOME\/.appName@. On Windows, a-typical path might be +typical path might be > C:/Documents And Settings/user/Application Data/appName @@ -1137,8 +1152,8 @@ On Unix, 'getUserDocumentsDirectory' returns the value of the @HOME@ environment variable. On Windows, the system is queried for a-suitable path; a typical path might be -@C:\/Documents and Settings\/user\/My Documents@.+suitable path; a typical path might be+@C:\/Documents And Settings\/user\/My Documents@. The operation may fail with: @@ -1162,17 +1177,17 @@ On Unix, 'getTemporaryDirectory' returns the value of the @TMPDIR@ environment variable or \"\/tmp\" if the variable isn\'t defined.-On Windows, the function checks for the existence of environment variables in +On Windows, the function checks for the existence of environment variables in the following order and uses the first path found: -* -TMP environment variable. +*+TMP environment variable. *-TEMP environment variable. +TEMP environment variable. *-USERPROFILE environment variable. +USERPROFILE environment variable. * The Windows directory@@ -1190,12 +1205,8 @@ Win32.getTemporaryDirectory #else getEnv "TMPDIR"-#if !__NHC__ `catchIOError` \e -> if isDoesNotExistError e then return "/tmp" else throw e-#else- `catchIOError` (\ex -> return "/tmp")-#endif #endif -- ToDo: This should be determined via autoconf (AC_EXEEXT)
cbits/directory.c view
@@ -7,5 +7,5 @@ #define INLINE #include "HsDirectory.h" -#endif /* !__NHC__ */+#endif
+ changelog.md view
@@ -0,0 +1,21 @@+# Changelog for [`directory` package](http://hackage.haskell.org/package/directory)++## 1.2.1.0 *Mar 2014*++ * Bundled with GHC 7.8.1++ * Add support for sub-second precision in `getModificationTime` when+ linked against `unix>=2.6.0.0`++ * Fix `createDirectoryIfMissing _ "."` in `C:\` on Windows++ * Remove support for NHC98 compiler++ * Update package to `cabal-version >= 1.10` format++ * Enhance Haddock documentation for `doesDirectoryExist` and+ `canonicalizePath`++ * Fix `findExecutable` to check that file permissions indicate executable++ * New convenience functions `findFiles` and `findFilesWith`
config.guess view
@@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name.-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,-# Inc.+# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2006-07-02'+timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by-# the Free Software Foundation; either version 2 of the License, or+# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but@@ -17,27 +15,23 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License-# along with this program; if not, write to the Free Software-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA-# 02110-1301, USA.+# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under-# the same distribution terms that you use for the rest of that program.---# Originally written by Per Bothner <per@bothner.com>.-# Please send patches to <config-patches@gnu.org>. Submit a context-# diff and a properly formatted ChangeLog entry.+# the same distribution terms that you use for the rest of that+# program. This Exception is an additional permission under section 7+# of the GNU General Public License, version 3 ("GPLv3"). #-# This script attempts to guess a canonical system name similar to-# config.sub. If it succeeds, it prints the system name on stdout, and-# exits with 0. Otherwise, it exits with 1.+# Originally written by Per Bothner. #-# The plan is that this can be called by configure scripts if you-# don't specify an explicit build system type.+# You can get the latest version of this script from:+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD+#+# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\@@ -56,8 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner.-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005-Free Software Foundation, Inc.+Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."@@ -139,12 +132,33 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in+Linux|GNU|GNU/*)+ # If the system lacks a compiler, then just pick glibc.+ # We could probably try harder.+ LIBC=gnu++ eval $set_cc_for_build+ cat <<-EOF > $dummy.c+ #include <features.h>+ #if defined(__UCLIBC__)+ LIBC=uclibc+ #elif defined(__dietlibc__)+ LIBC=dietlibc+ #else+ LIBC=gnu+ #endif+ EOF+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`+ ;;+esac+ # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward@@ -161,6 +175,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;;+ sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched@@ -169,7 +184,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \- | grep __ELF__ >/dev/null+ | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX?@@ -179,7 +194,7 @@ fi ;; *)- os=netbsd+ os=netbsd ;; esac # The OS release@@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;;+ *:Bitrig:*:*)+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}+ exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}@@ -222,7 +241,7 @@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*)- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on@@ -268,7 +287,10 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`- exit ;;+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.+ exitcode=$?+ trap '' 0+ exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead@@ -294,12 +316,12 @@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*)- echo powerpc-ibm-os400+ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;;- arm:riscos:*:*|arm:RISCOS:*:*)+ arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)@@ -323,15 +345,34 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;;+ s390x:SunOS:*:*)+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`+ exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;;- i86pc:SunOS:5.*:*)- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)+ echo i386-pc-auroraux${UNAME_RELEASE} exit ;;+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)+ eval $set_cc_for_build+ SUN_ARCH="i386"+ # If there is a compiler, see if it is configured for 64-bit objects.+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.+ # This test works for both compilers.+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \+ grep IS_64BIT_ARCH >/dev/null+ then+ SUN_ARCH="x86_64"+ fi+ fi+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`+ exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but@@ -374,23 +415,23 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)- echo m68k-atari-mint${UNAME_RELEASE}+ echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE}- exit ;;+ exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)- echo m68k-atari-mint${UNAME_RELEASE}+ echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)- echo m68k-milan-mint${UNAME_RELEASE}- exit ;;+ echo m68k-milan-mint${UNAME_RELEASE}+ exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)- echo m68k-hades-mint${UNAME_RELEASE}- exit ;;+ echo m68k-hades-mint${UNAME_RELEASE}+ exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)- echo m68k-unknown-mint${UNAME_RELEASE}- exit ;;+ echo m68k-unknown-mint${UNAME_RELEASE}+ exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;;@@ -460,8 +501,8 @@ echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*)- # DG/UX returns AViiON for all architectures- UNAME_PROCESSOR=`/usr/bin/uname -p`+ # DG/UX returns AViiON for all architectures+ UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \@@ -474,7 +515,7 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi- exit ;;+ exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;;@@ -531,7 +572,7 @@ echo rs6000-ibm-aix3.2 fi exit ;;- *:AIX:*:[45])+ *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000@@ -574,52 +615,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`- case "${sc_cpu_version}" in- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1- 532) # CPU_PA_RISC2_0- case "${sc_kernel_bits}" in- 32) HP_ARCH="hppa2.0n" ;;- 64) HP_ARCH="hppa2.0w" ;;+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`+ case "${sc_cpu_version}" in+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1+ 532) # CPU_PA_RISC2_0+ case "${sc_kernel_bits}" in+ 32) HP_ARCH="hppa2.0n" ;;+ 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20- esac ;;- esac+ esac ;;+ esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build- sed 's/^ //' << EOF >$dummy.c+ sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE- #include <stdlib.h>- #include <unistd.h>+ #define _HPUX_SOURCE+ #include <stdlib.h>+ #include <unistd.h> - int main ()- {- #if defined(_SC_KERNEL_BITS)- long bits = sysconf(_SC_KERNEL_BITS);- #endif- long cpu = sysconf (_SC_CPU_VERSION);+ int main ()+ {+ #if defined(_SC_KERNEL_BITS)+ long bits = sysconf(_SC_KERNEL_BITS);+ #endif+ long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu)- {- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;- case CPU_PA_RISC2_0:- #if defined(_SC_KERNEL_BITS)- switch (bits)- {- case 64: puts ("hppa2.0w"); break;- case 32: puts ("hppa2.0n"); break;- default: puts ("hppa2.0"); break;- } break;- #else /* !defined(_SC_KERNEL_BITS) */- puts ("hppa2.0"); break;- #endif- default: puts ("hppa1.0"); break;- }- exit (0);- }+ switch (cpu)+ {+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;+ case CPU_PA_RISC2_0:+ #if defined(_SC_KERNEL_BITS)+ switch (bits)+ {+ case 64: puts ("hppa2.0w"); break;+ case 32: puts ("hppa2.0n"); break;+ default: puts ("hppa2.0"); break;+ } break;+ #else /* !defined(_SC_KERNEL_BITS) */+ puts ("hppa2.0"); break;+ #endif+ default: puts ("hppa1.0"); break;+ }+ exit (0);+ } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa@@ -639,7 +680,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |- grep __LP64__ >/dev/null+ grep -q __LP64__ then HP_ARCH="hppa2.0w" else@@ -710,22 +751,22 @@ exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd- exit ;;+ exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi- exit ;;+ exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd- exit ;;+ exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd- exit ;;+ exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd- exit ;;+ exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;;@@ -749,14 +790,14 @@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"- exit ;;+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"+ exit ;; 5000:UNIX_System_V:4.*:*)- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}@@ -768,37 +809,51 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*)- case ${UNAME_MACHINE} in- pc98)- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;+ UNAME_PROCESSOR=`/usr/bin/uname -p`+ case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *)- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;;- i*:MINGW*:*)+ *:MINGW64*:*)+ echo ${UNAME_MACHINE}-pc-mingw64+ exit ;;+ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;;+ i*:MSYS*:*)+ echo ${UNAME_MACHINE}-pc-msys+ exit ;; i*:windows32*:*)- # uname -m includes "-pc" on this system.- echo ${UNAME_MACHINE}-mingw32+ # uname -m includes "-pc" on this system.+ echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;;- x86:Interix*:[3456]*)- echo i586-pc-interix${UNAME_RELEASE}- exit ;;- EM64T:Interix*:[3456]*)- echo x86_64-unknown-interix${UNAME_RELEASE}- exit ;;+ *:Interix*:*)+ case ${UNAME_MACHINE} in+ x86)+ echo i586-pc-interix${UNAME_RELEASE}+ exit ;;+ authenticamd | genuineintel | EM64T)+ echo x86_64-unknown-interix${UNAME_RELEASE}+ exit ;;+ IA64)+ echo ia64-unknown-interix${UNAME_RELEASE}+ exit ;;+ esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;;+ 8664:Windows_NT:*)+ echo x86_64-pc-mks+ exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we@@ -819,200 +874,157 @@ exit ;; *:GNU:*:*) # the GNU system- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;;+ aarch64:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;;+ aarch64_be:Linux:*:*)+ UNAME_MACHINE=aarch64_be+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;;+ alpha:Linux:*:*)+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in+ EV5) UNAME_MACHINE=alphaev5 ;;+ EV56) UNAME_MACHINE=alphaev56 ;;+ PCA56) UNAME_MACHINE=alphapca56 ;;+ PCA57) UNAME_MACHINE=alphapca56 ;;+ EV6) UNAME_MACHINE=alphaev6 ;;+ EV67) UNAME_MACHINE=alphaev67 ;;+ EV68*) UNAME_MACHINE=alphaev68 ;;+ esac+ objdump --private-headers /bin/sh | grep -q ld.so.1+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;;+ arc:Linux:*:* | arceb:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;; arm*:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ eval $set_cc_for_build+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \+ | grep -q __ARM_EABI__+ then+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ else+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \+ | grep -q __ARM_PCS_VFP+ then+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi+ else+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf+ fi+ fi exit ;; avr32*:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*)- echo cris-axis-linux-gnu+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*)- echo crisv32-axis-linux-gnu+ echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*)- echo frv-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;;+ hexagon:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;;+ i*86:Linux:*:*)+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}+ exit ;; ia64:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;;- mips:Linux:*:*)- eval $set_cc_for_build- sed 's/^ //' << EOF >$dummy.c- #undef CPU- #undef mips- #undef mipsel- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)- CPU=mipsel- #else- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)- CPU=mips- #else- CPU=- #endif- #endif-EOF- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '- /^CPU/{- s: ::g- p- }'`"- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }- ;;- mips64:Linux:*:*)+ mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU- #undef mips64- #undef mips64el+ #undef ${UNAME_MACHINE}+ #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)- CPU=mips64el+ CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)- CPU=mips64+ CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '- /^CPU/{- s: ::g- p- }'`"- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;;- or32:Linux:*:*)- echo or32-unknown-linux-gnu+ or1k:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;;- ppc:Linux:*:*)- echo powerpc-unknown-linux-gnu+ or32:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;;- ppc64:Linux:*:*)- echo powerpc64-unknown-linux-gnu+ padre:Linux:*:*)+ echo sparc-unknown-linux-${LIBC} exit ;;- alpha:Linux:*:*)- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in- EV5) UNAME_MACHINE=alphaev5 ;;- EV56) UNAME_MACHINE=alphaev56 ;;- PCA56) UNAME_MACHINE=alphapca56 ;;- PCA57) UNAME_MACHINE=alphapca56 ;;- EV6) UNAME_MACHINE=alphaev6 ;;- EV67) UNAME_MACHINE=alphaev67 ;;- EV68*) UNAME_MACHINE=alphaev68 ;;- esac- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}+ parisc64:Linux:*:* | hppa64:Linux:*:*)+ echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in- PA7*) echo hppa1.1-unknown-linux-gnu ;;- PA8*) echo hppa2.0-unknown-linux-gnu ;;- *) echo hppa-unknown-linux-gnu ;;+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;+ *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;;- parisc64:Linux:*:* | hppa64:Linux:*:*)- echo hppa64-unknown-linux-gnu+ ppc64:Linux:*:*)+ echo powerpc64-unknown-linux-${LIBC} exit ;;+ ppc:Linux:*:*)+ echo powerpc-unknown-linux-${LIBC}+ exit ;;+ ppc64le:Linux:*:*)+ echo powerpc64le-unknown-linux-${LIBC}+ exit ;;+ ppcle:Linux:*:*)+ echo powerpcle-unknown-linux-${LIBC}+ exit ;; s390:Linux:*:* | s390x:Linux:*:*)- echo ${UNAME_MACHINE}-ibm-linux+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*)- echo ${UNAME_MACHINE}-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;;+ tile*:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;; vax:Linux:*:*)- echo ${UNAME_MACHINE}-dec-linux-gnu+ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*)- echo x86_64-unknown-linux-gnu+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;;- i*86:Linux:*:*)- # The BFD linker knows what the default object file format is, so- # first see if it will tell us. cd to the root directory to prevent- # problems with other programs or directories called `ld' in the path.- # Set LC_ALL=C to ensure ld outputs messages in English.- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \- | sed -ne '/supported targets:/!d- s/[ ][ ]*/ /g- s/.*supported targets: *//- s/ .*//- p'`- case "$ld_supported_targets" in- elf32-i386)- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"- ;;- a.out-i386-linux)- echo "${UNAME_MACHINE}-pc-linux-gnuaout"- exit ;;- coff-i386)- echo "${UNAME_MACHINE}-pc-linux-gnucoff"- exit ;;- "")- # Either a pre-BFD a.out linker (linux-gnuoldld) or- # one that does not give us useful --help.- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"- exit ;;- esac- # Determine whether the default compiler is a.out or elf- eval $set_cc_for_build- sed 's/^ //' << EOF >$dummy.c- #include <features.h>- #ifdef __ELF__- # ifdef __GLIBC__- # if __GLIBC__ >= 2- LIBC=gnu- # else- LIBC=gnulibc1- # endif- # else- LIBC=gnulibc1- # endif- #else- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)- LIBC=gnu- #else- LIBC=gnuaout- #endif- #endif- #ifdef __dietlibc__- LIBC=dietlibc- #endif-EOF- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '- /^LIBC/{- s: ::g- p- }'`"- test x"${LIBC}" != x && {- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"- exit- }- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }- ;;+ xtensa*:Linux:*:*)+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}+ exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both@@ -1020,11 +1032,11 @@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*)- # Unixware is an offshoot of SVR4, but it has its own version- # number series starting with 2...- # I am not positive that other SVR4 systems won't match this,+ # Unixware is an offshoot of SVR4, but it has its own version+ # number series starting with 2...+ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms.- # Use sysv4.2uw... so that sysv4* matches it.+ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*)@@ -1041,7 +1053,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;;- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*)@@ -1056,7 +1068,7 @@ fi exit ;; i*86:*:5:[678]*)- # UnixWare 7.x, OpenUNIX and OpenServer 6.+ # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;;@@ -1084,10 +1096,13 @@ exit ;; pc:*:*:*) # Left here for compatibility:- # uname -m prints for DJGPP always 'pc', but it prints nothing about- # the processor, so we play safe by assuming i386.- echo i386-pc-msdosdjgpp- exit ;;+ # uname -m prints for DJGPP always 'pc', but it prints nothing about+ # the processor, so we play safe by assuming i586.+ # Note: whatever this is, it MUST be the same as what config.sub+ # prints for the "djgpp" host, or else GDB configury will decide that+ # this is a cross-build.+ echo i586-pc-msdosdjgpp+ exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;;@@ -1122,8 +1137,18 @@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \- && { echo i486-ncr-sysv4; exit; } ;;+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \+ && { echo i486-ncr-sysv4; exit; } ;;+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)+ OS_REL='.3'+ test -r /etc/.relid \+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;;@@ -1136,7 +1161,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;;- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*)@@ -1156,10 +1181,10 @@ echo ns32k-sni-sysv fi exit ;;- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort- # says <Richard.M.Bartel@ccMail.Census.GOV>- echo i586-unisys-sysv4- exit ;;+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort+ # says <Richard.M.Bartel@ccMail.Census.GOV>+ echo i586-unisys-sysv4+ exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm@@ -1185,11 +1210,11 @@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then- echo mips-nec-sysv${UNAME_RELEASE}+ echo mips-nec-sysv${UNAME_RELEASE} else- echo mips-unknown-sysv${UNAME_RELEASE}+ echo mips-unknown-sysv${UNAME_RELEASE} fi- exit ;;+ exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;;@@ -1199,6 +1224,12 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;;+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.+ echo i586-pc-haiku+ exit ;;+ x86_64:Haiku:*:*)+ echo x86_64-unknown-haiku+ exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;;@@ -1208,6 +1239,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;;+ SX-7:SUPER-UX:*:*)+ echo sx7-nec-superux${UNAME_RELEASE}+ exit ;;+ SX-8:SUPER-UX:*:*)+ echo sx8-nec-superux${UNAME_RELEASE}+ exit ;;+ SX-8R:SUPER-UX:*:*)+ echo sx8r-nec-superux${UNAME_RELEASE}+ exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;;@@ -1216,9 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown- case $UNAME_PROCESSOR in- unknown) UNAME_PROCESSOR=powerpc ;;- esac+ eval $set_cc_for_build+ if test "$UNAME_PROCESSOR" = unknown ; then+ UNAME_PROCESSOR=powerpc+ fi+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \+ grep IS_64BIT_ARCH >/dev/null+ then+ case $UNAME_PROCESSOR in+ i386) UNAME_PROCESSOR=x86_64 ;;+ powerpc) UNAME_PROCESSOR=powerpc64 ;;+ esac+ fi+ fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*)@@ -1232,7 +1284,10 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;;- NSE-?:NONSTOP_KERNEL:*:*)+ NEO-?:NONSTOP_KERNEL:*:*)+ echo neo-tandem-nsk${UNAME_RELEASE}+ exit ;;+ NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*)@@ -1277,13 +1332,13 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX)- echo mips-sei-seiux${UNAME_RELEASE}+ echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*)- UNAME_MACHINE=`(uname -p) 2>/dev/null`+ UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;;@@ -1298,11 +1353,14 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;;+ i*86:AROS:*:*)+ echo ${UNAME_MACHINE}-pc-aros+ exit ;;+ x86_64:VMkernel:*:*)+ echo ${UNAME_MACHINE}-unknown-esx+ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2- eval $set_cc_for_build cat >$dummy.c <<EOF #ifdef _SEQUENT_@@ -1320,11 +1378,11 @@ #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4- "4"+ "4" #else- ""+ "" #endif- ); exit (0);+ ); exit (0); #endif #endif @@ -1458,9 +1516,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be
config.sub view
@@ -1,44 +1,40 @@ #! /bin/sh # Configuration validation subroutine script.-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,-# Inc.+# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2006-07-02'+timestamp='2013-08-10' -# This file is (in principle) common to ALL GNU software.-# The presence of a machine in this file suggests that SOME GNU software-# can handle that machine. It does not imply ALL GNU software can.-#-# This file is free software; you can redistribute it and/or modify-# it under the terms of the GNU General Public License as published by-# the Free Software Foundation; either version 2 of the License, or+# This file is free software; you can redistribute it and/or modify it+# under the terms of the GNU General Public License as published by+# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. #-# This program is distributed in the hope that it will be useful,-# but WITHOUT ANY WARRANTY; without even the implied warranty of-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-# GNU General Public License for more details.+# This program is distributed in the hope that it will be useful, but+# WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU+# General Public License for more details. # # You should have received a copy of the GNU General Public License-# along with this program; if not, write to the Free Software-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA-# 02110-1301, USA.+# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under-# the same distribution terms that you use for the rest of that program.+# the same distribution terms that you use for the rest of that+# program. This Exception is an additional permission under section 7+# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to <config-patches@gnu.org>. Submit a context-# diff and a properly formatted ChangeLog entry.+# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from:+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD+ # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software.@@ -72,8 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005-Free Software Foundation, Inc.+Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."@@ -120,12 +115,18 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \+ knetbsd*-gnu* | netbsd*-gnu* | \+ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;;+ android-linux)+ os=-linux-android+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown+ ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ]@@ -148,10 +149,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \- -apple | -axis | -knuth | -cray)+ -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;;+ -bluegene*)+ os=-cnk+ ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1@@ -166,10 +170,10 @@ os=-chorusos basic_machine=$1 ;;- -chorusrdb)- os=-chorusrdb+ -chorusrdb)+ os=-chorusrdb basic_machine=$1- ;;+ ;; -hiux*) os=-hiuxwe2 ;;@@ -214,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;;+ -lynx*178)+ os=-lynxos178+ ;;+ -lynx*5)+ os=-lynxos5+ ;; -lynx*) os=-lynxos ;;@@ -238,24 +248,34 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \+ | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \+ | arc | arceb \+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \+ | avr | avr32 \+ | be32 | be64 \ | bfin \- | c4x | clipper \+ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \- | fr30 | frv \+ | epiphany \+ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \+ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \+ | le32 | le64 \+ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \- | maxq | mb | microblaze | mcore \+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \- | mips64vr | mips64vrel \+ | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \+ | mips64r5900 | mips64r5900el \+ | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \@@ -266,30 +286,45 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \+ | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \+ | moxie \ | mt \ | msp430 \- | nios | nios2 \+ | nds32 | nds32le | nds32be \+ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \- | or32 \+ | open8 \+ | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \+ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \+ | rl78 | rx \+ | score \+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \- | spu | strongarm \- | tahoe | thumb | tic4x | tic80 | tron \- | v850 | v850e \+ | spu \+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \+ | ubicom32 \+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \- | z8k)+ | x86 | xc16x | xstormy16 | xtensa \+ | z8k | z80) basic_machine=$basic_machine-unknown ;;- m6811 | m68hc11 | m6812 | m68hc12)- # Motorola 68HC11/12.+ c54x)+ basic_machine=tic54x-unknown+ ;;+ c55x)+ basic_machine=tic55x-unknown+ ;;+ c6x)+ basic_machine=tic6x-unknown+ ;;+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;;@@ -299,6 +334,21 @@ basic_machine=mt-unknown ;; + strongarm | thumb | xscale)+ basic_machine=arm-unknown+ ;;+ xgate)+ basic_machine=$basic_machine-unknown+ os=-none+ ;;+ xscaleeb)+ basic_machine=armeb-unknown+ ;;++ xscaleel)+ basic_machine=armel-unknown+ ;;+ # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users.@@ -313,29 +363,37 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \+ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \+ | be32-* | be64-* \ | bfin-* | bs2000-* \- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \- | clipper-* | craynv-* | cydra-* \+ | c[123]* | c30-* | [cjt]90-* | c4x-* \+ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \+ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \+ | le32-* | le64-* \+ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \- | m88110-* | m88k-* | maxq-* | mcore-* \+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \+ | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \- | mips64vr-* | mips64vrel-* \+ | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \+ | mips64r5900-* | mips64r5900el-* \+ | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \@@ -346,32 +404,42 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \+ | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \- | nios-* | nios2-* \+ | nds32-* | nds32le-* | nds32be-* \+ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \+ | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \- | romp-* | rs6000-* \- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \+ | rl78-* | romp-* | rs6000-* | rx-* \+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \- | tahoe-* | thumb-* \+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \+ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \+ | tile*-* \ | tron-* \- | v850-* | v850e-* | vax-* \+ | ubicom32-* \+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \+ | vax-* \ | we32k-* \- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \- | xstormy16-* | xtensa-* \+ | x86-* | x86_64-* | xc16x-* | xps100-* \+ | xstormy16-* | xtensa*-* \ | ymp-* \- | z8k-*)+ | z8k-* | z80-*) ;;+ # Recognize the basic CPU types without company name, with glob match.+ xtensa*)+ basic_machine=$basic_machine-unknown+ ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd)@@ -388,7 +456,7 @@ basic_machine=a29k-amd os=-udi ;;- abacus)+ abacus) basic_machine=abacus-unknown ;; adobe68k)@@ -434,6 +502,10 @@ basic_machine=m68k-apollo os=-bsd ;;+ aros)+ basic_machine=i386-pc+ os=-aros+ ;; aux) basic_machine=m68k-apple os=-aux@@ -442,10 +514,35 @@ basic_machine=ns32k-sequent os=-dynix ;;+ blackfin)+ basic_machine=bfin-unknown+ os=-linux+ ;;+ blackfin-*)+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`+ os=-linux+ ;;+ bluegene*)+ basic_machine=powerpc-ibm+ os=-cnk+ ;;+ c54x-*)+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`+ ;;+ c55x-*)+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`+ ;;+ c6x-*)+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`+ ;; c90) basic_machine=c90-cray os=-unicos ;;+ cegcc)+ basic_machine=arm-unknown+ os=-cegcc+ ;; convex-c1) basic_machine=c1-convex os=-bsd@@ -474,8 +571,8 @@ basic_machine=craynv-cray os=-unicosmp ;;- cr16c)- basic_machine=cr16c-unknown+ cr16 | cr16-*)+ basic_machine=cr16-unknown os=-elf ;; crds | unos)@@ -513,6 +610,10 @@ basic_machine=m88k-motorola os=-sysv3 ;;+ dicos)+ basic_machine=i686-pc+ os=-dicos+ ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp@@ -628,7 +729,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;;-# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32@@ -667,6 +767,14 @@ basic_machine=m68k-isi os=-sysv ;;+ m68knommu)+ basic_machine=m68k-unknown+ os=-linux+ ;;+ m68knommu-*)+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`+ os=-linux+ ;; m88k-omron*) basic_machine=m88k-omron ;;@@ -678,10 +786,21 @@ basic_machine=ns32k-utek os=-sysv ;;+ microblaze*)+ basic_machine=microblaze-xilinx+ ;;+ mingw64)+ basic_machine=x86_64-pc+ os=-mingw64+ ;; mingw32)- basic_machine=i386-pc+ basic_machine=i686-pc os=-mingw32 ;;+ mingw32ce)+ basic_machine=arm-unknown+ os=-mingw32ce+ ;; miniframe) basic_machine=m68000-convergent ;;@@ -710,10 +829,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;;+ msys)+ basic_machine=i686-pc+ os=-msys+ ;; mvs) basic_machine=i370-ibm os=-mvs ;;+ nacl)+ basic_machine=le32-unknown+ os=-nacl+ ;; ncr3000) basic_machine=i486-ncr os=-sysv4@@ -778,6 +905,12 @@ np1) basic_machine=np1-gould ;;+ neo-tandem)+ basic_machine=neo-tandem+ ;;+ nse-tandem)+ basic_machine=nse-tandem+ ;; nsr-tandem) basic_machine=nsr-tandem ;;@@ -808,6 +941,14 @@ basic_machine=i860-intel os=-osf ;;+ parisc)+ basic_machine=hppa-unknown+ os=-linux+ ;;+ parisc-*)+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`+ os=-linux+ ;; pbd) basic_machine=sparc-tti ;;@@ -852,9 +993,10 @@ ;; power) basic_machine=power-ibm ;;- ppc) basic_machine=powerpc-unknown+ ppc | ppcbe) basic_machine=powerpc-unknown ;;- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`+ ppc-* | ppcbe-*)+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown@@ -879,7 +1021,11 @@ basic_machine=i586-unknown os=-pw32 ;;- rdos)+ rdos | rdos64)+ basic_machine=x86_64-pc+ os=-rdos+ ;;+ rdos32) basic_machine=i386-pc os=-rdos ;;@@ -909,6 +1055,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;;+ sde)+ basic_machine=mipsisa32-sde+ os=-elf+ ;; sei) basic_machine=mips-sei os=-seiux@@ -920,6 +1070,9 @@ basic_machine=sh-hitachi os=-hms ;;+ sh5el)+ basic_machine=sh5le-unknown+ ;; sh64) basic_machine=sh64-unknown ;;@@ -941,6 +1094,9 @@ basic_machine=i860-stratus os=-sysv4 ;;+ strongarm-* | thumb-*)+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`+ ;; sun2) basic_machine=m68000-sun ;;@@ -997,17 +1153,9 @@ basic_machine=t90-cray os=-unicos ;;- tic54x | c54x*)- basic_machine=tic54x-unknown- os=-coff- ;;- tic55x | c55x*)- basic_machine=tic55x-unknown- os=-coff- ;;- tic6x | c6x*)- basic_machine=tic6x-unknown- os=-coff+ tile*)+ basic_machine=$basic_machine-unknown+ os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown@@ -1076,6 +1224,9 @@ xps | xps100) basic_machine=xps100-honeywell ;;+ xscale-* | xscalee[bl]-*)+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`+ ;; ymp) basic_machine=ymp-cray os=-unicos@@ -1084,6 +1235,10 @@ basic_machine=z8k-unknown os=-sim ;;+ z80-*-coff)+ basic_machine=z80-unknown+ os=-sim+ ;; none) basic_machine=none-none os=-none@@ -1122,7 +1277,7 @@ we32k) basic_machine=we32k-att ;;- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)@@ -1169,9 +1324,12 @@ if [ x"$os" != x"" ] then case $os in- # First match some system type aliases- # that might get confused with valid system types.+ # First match some system type aliases+ # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception.+ -auroraux)+ os=-auroraux+ ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;;@@ -1192,21 +1350,23 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \+ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \- | -aos* \+ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \- | -openbsd* | -solidbsd* \+ | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \- | -chorusos* | -chorusrdb* \- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \+ | -chorusos* | -chorusrdb* | -cegcc* \+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \@@ -1214,7 +1374,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \- | -skyos* | -haiku* | -rdos* | -toppers*)+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*)@@ -1253,7 +1413,7 @@ -opened*) os=-openedition ;;- -os400*)+ -os400*) os=-os400 ;; -wince*)@@ -1302,7 +1462,7 @@ -sinix*) os=-sysv4 ;;- -tpf*)+ -tpf*) os=-tpf ;; -triton*)@@ -1338,12 +1498,14 @@ -aros*) os=-aros ;;- -kaos*)- os=-kaos- ;; -zvmoe) os=-zvmoe ;;+ -dicos*)+ os=-dicos+ ;;+ -nacl*)+ ;; -none) ;; *)@@ -1366,9 +1528,12 @@ # system, and we'll never get to this point. case $basic_machine in- spu-*)+ score-*) os=-elf ;;+ spu-*)+ os=-elf+ ;; *-acorn) os=-riscix1.2 ;;@@ -1378,9 +1543,24 @@ arm*-semi) os=-aout ;;- c4x-* | tic4x-*)- os=-coff+ c4x-* | tic4x-*)+ os=-coff ;;+ c8051-*)+ os=-elf+ ;;+ hexagon-*)+ os=-elf+ ;;+ tic54x-*)+ os=-coff+ ;;+ tic55x-*)+ os=-coff+ ;;+ tic6x-*)+ os=-coff+ ;; # This must come before the *-dec entry. pdp10-*) os=-tops20@@ -1399,19 +1579,22 @@ ;; m68000-sun) os=-sunos3- # This also exists in the configure program, but was not the- # default.- # os=-sunos4 ;; m68*-cisco) os=-aout ;;+ mep-*)+ os=-elf+ ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;;+ or1k-*)+ os=-elf+ ;; or32-*) os=-coff ;;@@ -1430,7 +1613,7 @@ *-ibm) os=-aix ;;- *-knuth)+ *-knuth) os=-mmixware ;; *-wec)@@ -1535,7 +1718,7 @@ -sunos*) vendor=sun ;;- -aix*)+ -cnk*|-aix*) vendor=ibm ;; -beos*)
configure view
@@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles.-# Generated by GNU Autoconf 2.67 for Haskell directory package 1.0.+# Generated by GNU Autoconf 2.69 for Haskell directory package 1.0. # # Report bugs to <libraries@haskell.org>. # #-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software-# Foundation, Inc.+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation@@ -91,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator.+as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR@@ -135,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall+ # into an infinite loop, continuously re-executing ourselves.+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then+ _as_can_reexec=no; export _as_can_reexec;+ # We cannot yet assume a decent shell, so we have to provide a+# neutralization value for shells without unset; and this also+# works around shells that cannot unset nonexistent variables.+# Preserve -v and -x to the replacement shell.+BASH_ENV=/dev/null+ENV=/dev/null+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV+case $- in # ((((+ *v*x* | *x*v* ) as_opts=-vx ;;+ *v* ) as_opts=-v ;;+ *x* ) as_opts=-x ;;+ * ) as_opts= ;;+esac+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}+# Admittedly, this is quite paranoid, since all the known shells bail+# out after a failed `exec'.+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2+as_fn_exit 255+ fi+ # We don't want this to propagate to other subprocesses.+ { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh@@ -168,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi-test x\$exitcode = x0 || exit 1"+test x\$exitcode = x0 || exit 1+test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&@@ -213,14 +238,25 @@ if test "x$CONFIG_SHELL" != x; then :- # We cannot yet assume a decent shell, so we have to provide a- # neutralization value for shells without unset; and this also- # works around shells that cannot unset nonexistent variables.- BASH_ENV=/dev/null- ENV=/dev/null- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV- export CONFIG_SHELL- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}+ export CONFIG_SHELL+ # We cannot yet assume a decent shell, so we have to provide a+# neutralization value for shells without unset; and this also+# works around shells that cannot unset nonexistent variables.+# Preserve -v and -x to the replacement shell.+BASH_ENV=/dev/null+ENV=/dev/null+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV+case $- in # ((((+ *v*x* | *x*v* ) as_opts=-vx ;;+ *v* ) as_opts=-v ;;+ *x* ) as_opts=-x ;;+ * ) as_opts= ;;+esac+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}+# Admittedly, this is quite paranoid, since all the known shells bail+# out after a failed `exec'.+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2+exit 255 fi if test x$as_have_required = xno; then :@@ -323,6 +359,14 @@ } # as_fn_mkdir_p++# as_fn_executable_p FILE+# -----------------------+# Test if FILE is an executable regular file.+as_fn_executable_p ()+{+ test -f "$1" && test -x "$1"+} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take@@ -444,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have+ # already done that, so ensure we don't try to do so again and fall+ # in an infinite loop. This has already happened in practice.+ _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this).@@ -478,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.- # In both cases, we have to default to `cp -p'.+ # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||- as_ln_s='cp -p'+ as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else- as_ln_s='cp -p'+ as_ln_s='cp -pR' fi else- as_ln_s='cp -p'+ as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null@@ -499,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then- as_test_x='test -x'-else- if ls -dL / >/dev/null 2>&1; then- as_ls_L_option=L- else- as_ls_L_option=- fi- as_test_x='- eval sh -c '\''- if test -d "$1"; then- test -d "$1/.";- else- case $1 in #(- -*)set "./$1";;- esac;- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((- ???[sx]*):;;*)false;;esac;fi- '\'' sh- '-fi-as_executable_p=$as_test_x+as_test_x='test -x'+as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"@@ -1062,7 +1090,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac@@ -1113,8 +1141,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.- If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi@@ -1347,9 +1373,9 @@ if $ac_init_version; then cat <<\_ACEOF Haskell directory package configure 1.0-generated by GNU Autoconf 2.67+generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc.+Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF@@ -1393,7 +1419,7 @@ ac_retval=1 fi- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile@@ -1430,7 +1456,7 @@ ac_retval=1 fi- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp@@ -1443,10 +1469,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack- if eval "test \"\${$3+set}\"" = set; then :+ if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; }-if eval "test \"\${$3+set}\"" = set; then :+if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3@@ -1513,7 +1539,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; }-if eval "test \"\${$3+set}\"" = set; then :+if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler"@@ -1522,7 +1548,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1563,7 +1589,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run@@ -1577,7 +1603,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; }-if eval "test \"\${$3+set}\"" = set; then :+if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -1595,7 +1621,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; }- eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile cat >config.log <<_ACEOF@@ -1603,7 +1629,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by Haskell directory package $as_me 1.0, which was-generated by GNU Autoconf 2.67. Invocation command line was+generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1861,7 +1887,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1973,7 +1999,7 @@ set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then@@ -1985,7 +2011,7 @@ 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+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2@@ -2013,7 +2039,7 @@ set dummy gcc; 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_ac_ct_CC+set}" = set; then :+if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then@@ -2025,7 +2051,7 @@ 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+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2@@ -2066,7 +2092,7 @@ set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then@@ -2078,7 +2104,7 @@ 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+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2@@ -2106,7 +2132,7 @@ set dummy cc; 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_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then@@ -2119,7 +2145,7 @@ 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+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue@@ -2165,7 +2191,7 @@ set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then :+if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then@@ -2177,7 +2203,7 @@ 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+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2@@ -2209,7 +2235,7 @@ set dummy $ac_prog; 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_ac_ct_CC+set}" = set; then :+if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then@@ -2221,7 +2247,7 @@ 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+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2@@ -2264,7 +2290,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5@@ -2379,7 +2405,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; }@@ -2422,7 +2448,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5@@ -2481,7 +2507,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'.-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } fi fi fi@@ -2492,7 +2518,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; }-if test "${ac_cv_objext+set}" = set; then :+if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -2533,7 +2559,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi@@ -2543,7 +2569,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }-if test "${ac_cv_c_compiler_gnu+set}" = set; then :+if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -2580,7 +2606,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; }-if test "${ac_cv_prog_cc_g+set}" = set; then :+if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag@@ -2658,7 +2684,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }-if test "${ac_cv_prog_cc_c89+set}" = set; then :+if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no@@ -2667,8 +2693,7 @@ /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h>-#include <sys/types.h>-#include <sys/stat.h>+struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int);@@ -2768,7 +2793,7 @@ CPP= fi if test -z "$CPP"; then- if test "${ac_cv_prog_CPP+set}" = set; then :+ if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded@@ -2884,7 +2909,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check-See \`config.log' for more details" "$LINENO" 5 ; }+See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c@@ -2896,7 +2921,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }-if test "${ac_cv_path_GREP+set}" = set; then :+if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then@@ -2910,7 +2935,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue+ as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in@@ -2959,7 +2984,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; }-if test "${ac_cv_path_EGREP+set}" = set; then :+if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1@@ -2976,7 +3001,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue+ as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in@@ -3026,7 +3051,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; }-if test "${ac_cv_header_stdc+set}" = set; then :+if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext@@ -3231,10 +3256,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then- test "x$cache_file" != "x/dev/null" &&+ if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;}- cat confcache >$cache_file+ if test ! -f "$cache_file" || test -h "$cache_file"; then+ cat confcache >"$cache_file"+ else+ case $cache_file in #(+ */* | ?:*)+ mv -f confcache "$cache_file"$$ &&+ mv -f "$cache_file"$$ "$cache_file" ;; #(+ *)+ mv -f confcache "$cache_file" ;;+ esac+ fi+ fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}@@ -3266,7 +3302,7 @@ -: ${CONFIG_STATUS=./config.status}+: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS"@@ -3367,6 +3403,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator.+as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR@@ -3562,16 +3599,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.- # In both cases, we have to default to `cp -p'.+ # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||- as_ln_s='cp -p'+ as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else- as_ln_s='cp -p'+ as_ln_s='cp -pR' fi else- as_ln_s='cp -p'+ as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null@@ -3631,29 +3668,17 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then- as_test_x='test -x'-else- if ls -dL / >/dev/null 2>&1; then- as_ls_L_option=L- else- as_ls_L_option=- fi- as_test_x='- eval sh -c '\''- if test -d "$1"; then- test -d "$1/.";- else- case $1 in #(- -*)set "./$1";;- esac;- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((- ???[sx]*):;;*)false;;esac;fi- '\'' sh- '-fi-as_executable_p=$as_test_x +# as_fn_executable_p FILE+# -----------------------+# Test if FILE is an executable regular file.+as_fn_executable_p ()+{+ test -f "$1" && test -x "$1"+} # as_fn_executable_p+as_test_x='test -x'+as_executable_p=as_fn_executable_p+ # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -3674,7 +3699,7 @@ # values after options handling. ac_log=" This file was extended by Haskell directory package $as_me 1.0, which was-generated by GNU Autoconf 2.67. Invocation command line was+generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS@@ -3727,10 +3752,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ Haskell directory package config.status 1.0-configured by $0, generated by GNU Autoconf 2.67,+configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc.+Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3810,7 +3835,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL'@@ -3841,7 +3866,7 @@ case $ac_config_target in "include/HsDirectoryConfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/HsDirectoryConfig.h" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -3862,9 +3887,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || {- tmp=+ tmp= ac_tmp= trap 'exit_status=$?- { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status+ : "${ac_tmp:=$tmp}"+ { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 }@@ -3872,18 +3898,19 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&- test -n "$tmp" && test -d "$tmp"+ test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5+ac_tmp=$tmp # Set up the scripts for CONFIG_HEADERS section. # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then-cat >"$tmp/defines.awk" <<\_ACAWK ||+cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -3895,8 +3922,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do- ac_t=`sed -n "/$ac_delim/p" confdefs.h`- if test -z "$ac_t"; then+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`+ if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5@@ -3997,7 +4024,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);;- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;+ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac@@ -4016,7 +4043,7 @@ for ac_f do case $ac_f in- -) ac_f="$tmp/stdin";;+ -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'.@@ -4025,7 +4052,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac ||- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'"@@ -4051,8 +4078,8 @@ esac case $ac_tag in- *:-:* | *:-) cat >"$tmp/stdin" \- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;+ *:-:* | *:-) cat >"$ac_tmp/stdin" \+ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac@@ -4125,20 +4152,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"- } >"$tmp/config.h" \+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"+ } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5- if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file"- mv "$tmp/config.h" "$ac_file" \+ mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \- && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;;
+ directory.buildinfo view
@@ -0,0 +1,1 @@+install-includes: HsDirectoryConfig.h
directory.cabal view
@@ -1,45 +1,68 @@-name: directory-version: 1.2.0.1-license: BSD3-license-file: LICENSE-maintainer: libraries@haskell.org-bug-reports: http://hackage.haskell.org/trac/ghc/newticket?component=libraries/directory-synopsis: library for directory handling+name: directory+version: 1.2.1.0+-- GHC 7.6.3 released with 1.2.0.1+license: BSD3+license-file: LICENSE+maintainer: libraries@haskell.org+bug-reports: http://ghc.haskell.org/trac/ghc/newticket?component=libraries/directory+synopsis: library for directory handling description:- This package provides a library for handling directories.+ This package provides a library for handling directories. category: System-build-type: Configure+build-type: Configure+cabal-version: >= 1.10+tested-with: GHC==7.6.3, GHC==7.6.2, GHC==7.6.1, GHC==7.4.2, GHC==7.4.1+ extra-tmp-files:- config.log config.status autom4te.cache- include/HsDirectoryConfig.h+ autom4te.cache+ config.log+ config.status+ include/HsDirectoryConfig.h+ extra-source-files:- config.guess config.sub install-sh- configure.ac configure include/HsDirectoryConfig.h.in-cabal-version: >= 1.6+ changelog.md+ config.guess+ config.sub+ configure+ configure.ac+ directory.buildinfo+ include/HsDirectoryConfig.h.in+ install-sh source-repository head type: git- location: http://darcs.haskell.org/packages/directory.git/+ location: http://git.haskell.org/packages/directory.git -Library {+source-repository this+ type: git+ location: http://git.haskell.org/packages/directory.git+ tag: directory-1.2.0.2-release++Library+ default-language: Haskell2010+ other-extensions:+ CPP+ NondecreasingIndentation+ Trustworthy+ exposed-modules:- System.Directory+ System.Directory+ c-sources:- cbits/directory.c+ cbits/directory.c include-dirs: include- includes: HsDirectory.h- install-includes: HsDirectory.h HsDirectoryConfig.h- extensions: CPP, ForeignFunctionInterface- if impl(ghc >= 7.1)- extensions: NondecreasingIndentation- build-depends: base >= 4.2 && < 4.7,- time < 1.5,- filepath >= 1.1 && < 1.4- if !impl(nhc98) {- if os(windows) {- build-depends: Win32- } else {- build-depends: unix- }- }-}+ includes:+ HsDirectory.h+ install-includes:+ HsDirectory.h++ build-depends:+ base >= 4.5 && < 4.8,+ time >= 1.4 && < 1.5,+ filepath >= 1.3 && < 1.4+ if os(windows)+ build-depends: Win32 >= 2.2.2 && < 2.4+ else+ build-depends: unix >= 2.5.1 && < 2.8++ ghc-options: -Wall
include/HsDirectory.h view
@@ -9,17 +9,13 @@ #ifndef __HSDIRECTORY_H__ #define __HSDIRECTORY_H__ -#ifdef __NHC__-#include "Nhc98BaseConfig.h"-#else- // On Solaris we have to make sure _FILE_OFFSET_BITS is defined // before including <sys/stat.h> below, because that header // will try and define it if it isn't already. #include "HsFFI.h" #include "HsDirectoryConfig.h"-#endif+ // Otherwise these clash with similar definitions from other packages: #undef PACKAGE_BUGREPORT #undef PACKAGE_NAME
− include/HsDirectoryConfig.h
@@ -1,50 +0,0 @@-/* include/HsDirectoryConfig.h. Generated from HsDirectoryConfig.h.in by configure. */-/* include/HsDirectoryConfig.h.in. Generated from configure.ac by autoheader. */--/* Define to 1 if you have the <inttypes.h> header file. */-#define HAVE_INTTYPES_H 1--/* Define to 1 if you have the <memory.h> header file. */-#define HAVE_MEMORY_H 1--/* Define to 1 if you have the <stdint.h> header file. */-#define HAVE_STDINT_H 1--/* Define to 1 if you have the <stdlib.h> header file. */-#define HAVE_STDLIB_H 1--/* Define to 1 if you have the <strings.h> header file. */-#define HAVE_STRINGS_H 1--/* Define to 1 if you have the <string.h> header file. */-#define HAVE_STRING_H 1--/* Define to 1 if you have the <sys/stat.h> header file. */-#define HAVE_SYS_STAT_H 1--/* Define to 1 if you have the <sys/types.h> header file. */-#define HAVE_SYS_TYPES_H 1--/* Define to 1 if you have the <unistd.h> header file. */-#define HAVE_UNISTD_H 1--/* Define to the address where bug reports for this package should be sent. */-#define PACKAGE_BUGREPORT "libraries@haskell.org"--/* Define to the full name of this package. */-#define PACKAGE_NAME "Haskell directory package"--/* Define to the full name and version of this package. */-#define PACKAGE_STRING "Haskell directory package 1.0"--/* Define to the one symbol short name of this package. */-#define PACKAGE_TARNAME "directory"--/* Define to the home page for this package. */-#define PACKAGE_URL ""--/* Define to the version of this package. */-#define PACKAGE_VERSION "1.0"--/* Define to 1 if you have the ANSI C header files. */-#define STDC_HEADERS 1
install-sh view
@@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-10-14.15+scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the@@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent-# `make' implicit rules from creating a file called install from it+# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written@@ -48,7 +48,7 @@ # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it.-doit="${DOITPROG-}"+doit=${DOITPROG-} if test -z "$doit"; then doit_exec=exec else@@ -58,34 +58,49 @@ # Put in absolute file names if you don't have them in your path; # or use environment vars. -mvprog="${MVPROG-mv}"-cpprog="${CPPROG-cp}"-chmodprog="${CHMODPROG-chmod}"-chownprog="${CHOWNPROG-chown}"-chgrpprog="${CHGRPPROG-chgrp}"-stripprog="${STRIPPROG-strip}"-rmprog="${RMPROG-rm}"-mkdirprog="${MKDIRPROG-mkdir}"+chgrpprog=${CHGRPPROG-chgrp}+chmodprog=${CHMODPROG-chmod}+chownprog=${CHOWNPROG-chown}+cmpprog=${CMPPROG-cmp}+cpprog=${CPPROG-cp}+mkdirprog=${MKDIRPROG-mkdir}+mvprog=${MVPROG-mv}+rmprog=${RMPROG-rm}+stripprog=${STRIPPROG-strip} -posix_glob=+posix_glob='?'+initialize_posix_glob='+ test "$posix_glob" != "?" || {+ if (set -f) 2>/dev/null; then+ posix_glob=+ else+ posix_glob=:+ fi+ }+'+ posix_mkdir= # Desired mode of installed file. mode=0755 +chgrpcmd= chmodcmd=$chmodprog chowncmd=-chgrpcmd=-stripcmd=+mvcmd=$mvprog rmcmd="$rmprog -f"-mvcmd="$mvprog"+stripcmd=+ src= dst= dir_arg=-dstarg=+dst_arg=++copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE+usage="\+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES...@@ -95,65 +110,59 @@ In the 4th, create DIRECTORIES. Options:--c (ignored)--d create directories instead of installing files.--g GROUP $chgrpprog installed files to GROUP.--m MODE $chmodprog installed files to MODE.--o USER $chownprog installed files to USER.--s $stripprog installed files.--t DIRECTORY install into DIRECTORY.--T report an error if DSTFILE is a directory.---help display this help and exit.---version display version info and exit.+ --help display this help and exit.+ --version display version info and exit. + -c (ignored)+ -C install only if different (preserve the last data modification time)+ -d create directories instead of installing files.+ -g GROUP $chgrpprog installed files to GROUP.+ -m MODE $chmodprog installed files to MODE.+ -o USER $chownprog installed files to USER.+ -s $stripprog installed files.+ -t DIRECTORY install into DIRECTORY.+ -T report an error if DSTFILE is a directory.+ Environment variables override the default commands:- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG+ RMPROG STRIPPROG " while test $# -ne 0; do case $1 in- -c) shift- continue;;+ -c) ;; - -d) dir_arg=true- shift- continue;;+ -C) copy_on_change=true;; + -d) dir_arg=true;;+ -g) chgrpcmd="$chgrpprog $2"- shift- shift- continue;;+ shift;; --help) echo "$usage"; exit $?;; -m) mode=$2- shift- shift case $mode in *' '* | *' '* | *' '* | *'*'* | *'?'* | *'['*) echo "$0: invalid mode: $mode" >&2 exit 1;; esac- continue;;+ shift;; -o) chowncmd="$chownprog $2"- shift- shift- continue;;+ shift;; - -s) stripcmd=$stripprog- shift- continue;;+ -s) stripcmd=$stripprog;; - -t) dstarg=$2- shift- shift- continue;;+ -t) dst_arg=$2+ # Protect names problematic for 'test' and other utilities.+ case $dst_arg in+ -* | [=\(\)!]) dst_arg=./$dst_arg;;+ esac+ shift;; - -T) no_target_directory=true- shift- continue;;+ -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; @@ -165,21 +174,26 @@ *) break;; esac+ shift done -if test $# -ne 0 && test -z "$dir_arg$dstarg"; then+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. # Otherwise, the last argument is the destination. Remove it from $@. for arg do- if test -n "$dstarg"; then+ if test -n "$dst_arg"; then # $@ is not empty: it contains at least $arg.- set fnord "$@" "$dstarg"+ set fnord "$@" "$dst_arg" shift # fnord fi shift # arg- dstarg=$arg+ dst_arg=$arg+ # Protect names problematic for 'test' and other utilities.+ case $dst_arg in+ -* | [=\(\)!]) dst_arg=./$dst_arg;;+ esac done fi @@ -188,13 +202,17 @@ echo "$0: no input file specified." >&2 exit 1 fi- # It's OK to call `install-sh -d' without argument.+ # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi if test -z "$dir_arg"; then- trap '(exit $?); exit' 1 2 13 15+ do_exit='(exit $ret); exit $ret'+ trap "ret=129; $do_exit" 1+ trap "ret=130; $do_exit" 2+ trap "ret=141; $do_exit" 13+ trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps.@@ -222,9 +240,9 @@ for src do- # Protect names starting with `-'.+ # Protect names problematic for 'test' and other utilities. case $src in- -*) src=./$src ;;+ -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then@@ -242,22 +260,17 @@ exit 1 fi - if test -z "$dstarg"; then+ if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi-- dst=$dstarg- # Protect names starting with `-'.- case $dst in- -*) dst=./$dst ;;- esac+ dst=$dst_arg # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then- echo "$0: $dstarg: Is a directory" >&2+ echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst@@ -341,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or- # other-writeable bit of parent directory when it shouldn't.+ # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in@@ -378,33 +391,26 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in- /*) prefix=/ ;;- -*) prefix=./ ;;- *) prefix= ;;+ /*) prefix='/';;+ [-=\(\)!]*) prefix='./';;+ *) prefix='';; esac - case $posix_glob in- '')- if (set -f) 2>/dev/null; then- posix_glob=true- else- posix_glob=false- fi ;;- esac+ eval "$initialize_posix_glob" oIFS=$IFS IFS=/- $posix_glob && set -f+ $posix_glob set -f set fnord $dstdir shift- $posix_glob && set +f+ $posix_glob set +f IFS=$oIFS prefixes= for d do- test -z "$d" && continue+ test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then@@ -459,42 +465,55 @@ # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. #- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - # Now rename the file to the real destination.- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \- || {- # The rename failed, perhaps because mv can't rename something else- # to itself, or perhaps because mv is so ancient that it does not- # support -f.+ # If -C, don't bother to copy if it wouldn't change the file.+ if $copy_on_change &&+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - # Now remove or move aside any old file at destination location.- # We try this two ways since rm can't unlink itself on some- # systems and the destination file might be busy for other- # reasons. In this case, the final cleanup might fail but the new- # file should still install successfully.- {- if test -f "$dst"; then- $doit $rmcmd -f "$dst" 2>/dev/null \- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\- || {- echo "$0: cannot unlink or rename $dst" >&2- (exit 1); exit 1- }- else- :- fi- } &&+ eval "$initialize_posix_glob" &&+ $posix_glob set -f &&+ set X $old && old=:$2:$4:$5:$6 &&+ set X $new && new=:$2:$4:$5:$6 &&+ $posix_glob set +f && - # Now rename the file to the real destination.- $doit $mvcmd "$dsttmp" "$dst"- }- } || exit 1+ test "$old" = "$new" &&+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1+ then+ rm -f "$dsttmp"+ else+ # Rename the file to the real destination.+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + # The rename failed, perhaps because mv can't rename something else+ # to itself, or perhaps because mv is so ancient that it does not+ # support -f.+ {+ # Now remove or move aside any old file at destination location.+ # We try this two ways since rm can't unlink itself on some+ # systems and the destination file might be busy for other+ # reasons. In this case, the final cleanup might fail but the new+ # file should still install successfully.+ {+ test ! -f "$dst" ||+ $doit $rmcmd -f "$dst" 2>/dev/null ||+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }+ } ||+ { echo "$0: cannot unlink or rename $dst" >&2+ (exit 1); exit 1+ }+ } &&++ # Now rename the file to the real destination.+ $doit $mvcmd "$dsttmp" "$dst"+ }+ fi || exit 1+ trap '' 0 fi done@@ -503,5 +522,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H"-# time-stamp-end: "$"+# time-stamp-time-zone: "UTC"+# time-stamp-end: "; # UTC" # End: