[qflow] 01/11: Added qflow option "-v" or "--version" to print qflow version number; prevented qflow from printing a message about setup before arguments are parsed, and if either "--version" or "--help" was given.
Ruben Undheim
rubund-guest at moszumanska.debian.org
Thu Apr 16 18:01:02 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to tag upstream/1.0.93
in repository qflow.
commit a059a2d9c50ef50af88653df289adb41e9710243
Author: Tim Edwards <tim at opencircuitdesign.com>
Date: Wed Feb 25 19:37:54 2015 -0500
Added qflow option "-v" or "--version" to print qflow version
number; prevented qflow from printing a message about setup
before arguments are parsed, and if either "--version" or
"--help" was given.
---
config.log | 286 ++++++++++++++++++++++++++-------------------------
config.status | 50 ++++-----
configure | 237 +++++++++++++++++++++---------------------
scripts/Makefile | 17 +--
scripts/Makefile.in | 3 +
scripts/qflow.sh.in | 27 +++--
src/Makefile | 18 ++--
tech/Makefile | 4 +-
tech/osu035/Makefile | 6 +-
tech/osu050/Makefile | 6 +-
10 files changed, 336 insertions(+), 318 deletions(-)
diff --git a/config.log b/config.log
index 6ddf20c..8b4a73a 100644
--- a/config.log
+++ b/config.log
@@ -2,7 +2,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by configure, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ ./configure
@@ -10,13 +10,13 @@ generated by GNU Autoconf 2.68. Invocation command line was
## Platform. ##
## --------- ##
-hostname = stravinsky.tim.linglan.net
+hostname = stravinsky
uname -m = x86_64
-uname -r = 3.3.4-3.fc16.x86_64
+uname -r = 3.18.3-201.fc21.x86_64
uname -s = Linux
-uname -v = #1 SMP Thu May 3 14:46:44 UTC 2012
+uname -v = #1 SMP Mon Jan 19 15:59:31 UTC 2015
-/usr/bin/uname -p = unknown
+/usr/bin/uname -p = x86_64
/bin/uname -X = unknown
/bin/arch = x86_64
@@ -39,79 +39,81 @@ PATH: /usr/local/bin
## Core tests. ##
## ----------- ##
-configure:2007: checking build system type
-configure:2021: result: x86_64-unknown-linux-gnu
-configure:2041: checking host system type
-configure:2054: result: x86_64-unknown-linux-gnu
-configure:2140: checking for gcc
-configure:2156: found /usr/bin/gcc
-configure:2167: result: gcc
-configure:2396: checking for C compiler version
-configure:2405: gcc --version >&5
-gcc (GCC) 4.6.3 20120306 (Red Hat 4.6.3-2)
-Copyright (C) 2011 Free Software Foundation, Inc.
+configure:2025: checking build system type
+configure:2039: result: x86_64-unknown-linux-gnu
+configure:2059: checking host system type
+configure:2072: result: x86_64-unknown-linux-gnu
+configure:2158: checking for gcc
+configure:2174: found /bin/gcc
+configure:2185: result: gcc
+configure:2414: checking for C compiler version
+configure:2423: gcc --version >&5
+gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
+Copyright (C) 2014 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.
-configure:2416: $? = 0
-configure:2405: gcc -v >&5
+configure:2434: $? = 0
+configure:2423: gcc -v >&5
Using built-in specs.
COLLECT_GCC=gcc
-COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.6.3/lto-wrapper
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
Target: x86_64-redhat-linux
-Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib [...]
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-ar [...]
Thread model: posix
-gcc version 4.6.3 20120306 (Red Hat 4.6.3-2) (GCC)
-configure:2416: $? = 0
-configure:2405: gcc -V >&5
-gcc: error: unrecognized option '-V'
+gcc version 4.9.2 20141101 (Red Hat 4.9.2-1) (GCC)
+configure:2434: $? = 0
+configure:2423: gcc -V >&5
+gcc: error: unrecognized command line option '-V'
gcc: fatal error: no input files
compilation terminated.
-configure:2416: $? = 4
-configure:2405: gcc -qversion >&5
-gcc: error: unrecognized option '-qversion'
+configure:2434: $? = 4
+configure:2423: gcc -qversion >&5
+gcc: error: unrecognized command line option '-qversion'
gcc: fatal error: no input files
compilation terminated.
-configure:2416: $? = 4
-configure:2436: checking whether the C compiler works
-configure:2458: gcc conftest.c >&5
-configure:2462: $? = 0
-configure:2510: result: yes
-configure:2513: checking for C compiler default output file name
-configure:2515: result: a.out
-configure:2521: checking for suffix of executables
-configure:2528: gcc -o conftest conftest.c >&5
-configure:2532: $? = 0
-configure:2554: result:
-configure:2576: checking whether we are cross compiling
-configure:2584: gcc -o conftest conftest.c >&5
-configure:2588: $? = 0
-configure:2595: ./conftest
-configure:2599: $? = 0
-configure:2614: result: no
-configure:2619: checking for suffix of object files
-configure:2641: gcc -c conftest.c >&5
-configure:2645: $? = 0
-configure:2666: result: o
-configure:2670: checking whether we are using the GNU C compiler
-configure:2689: gcc -c conftest.c >&5
-configure:2689: $? = 0
-configure:2698: result: yes
-configure:2707: checking whether gcc accepts -g
-configure:2727: gcc -c -g conftest.c >&5
-configure:2727: $? = 0
-configure:2768: result: yes
-configure:2785: checking for gcc option to accept ISO C89
-configure:2849: gcc -c -g -O2 conftest.c >&5
-configure:2849: $? = 0
-configure:2862: result: none needed
-configure:2887: checking how to run the C preprocessor
-configure:2918: gcc -E conftest.c
-configure:2918: $? = 0
-configure:2932: gcc -E conftest.c
+configure:2434: $? = 4
+configure:2454: checking whether the C compiler works
+configure:2476: gcc conftest.c >&5
+configure:2480: $? = 0
+configure:2528: result: yes
+configure:2531: checking for C compiler default output file name
+configure:2533: result: a.out
+configure:2539: checking for suffix of executables
+configure:2546: gcc -o conftest conftest.c >&5
+configure:2550: $? = 0
+configure:2572: result:
+configure:2594: checking whether we are cross compiling
+configure:2602: gcc -o conftest conftest.c >&5
+configure:2606: $? = 0
+configure:2613: ./conftest
+configure:2617: $? = 0
+configure:2632: result: no
+configure:2637: checking for suffix of object files
+configure:2659: gcc -c conftest.c >&5
+configure:2663: $? = 0
+configure:2684: result: o
+configure:2688: checking whether we are using the GNU C compiler
+configure:2707: gcc -c conftest.c >&5
+configure:2707: $? = 0
+configure:2716: result: yes
+configure:2725: checking whether gcc accepts -g
+configure:2745: gcc -c -g conftest.c >&5
+configure:2745: $? = 0
+configure:2786: result: yes
+configure:2803: checking for gcc option to accept ISO C89
+configure:2866: gcc -c -g -O2 conftest.c >&5
+configure:2866: $? = 0
+configure:2879: result: none needed
+configure:2904: checking how to run the C preprocessor
+configure:2935: gcc -E conftest.c
+configure:2935: $? = 0
+configure:2949: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
+ #include <ac_nonexistent.h>
+ ^
compilation terminated.
-configure:2932: $? = 1
+configure:2949: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
@@ -122,13 +124,15 @@ configure: failed program was:
| #define PACKAGE_URL ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:2957: result: gcc -E
-configure:2977: gcc -E conftest.c
-configure:2977: $? = 0
-configure:2991: gcc -E conftest.c
+configure:2974: result: gcc -E
+configure:2994: gcc -E conftest.c
+configure:2994: $? = 0
+configure:3008: gcc -E conftest.c
conftest.c:9:28: fatal error: ac_nonexistent.h: No such file or directory
+ #include <ac_nonexistent.h>
+ ^
compilation terminated.
-configure:2991: $? = 1
+configure:3008: $? = 1
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME ""
@@ -139,75 +143,75 @@ configure: failed program was:
| #define PACKAGE_URL ""
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:3020: checking for library containing strerror
-configure:3051: gcc -o conftest -g -O2 conftest.c >&5
-configure:3051: $? = 0
-configure:3068: result: none required
-configure:3093: checking for a BSD-compatible install
-configure:3161: result: /usr/bin/install -c
-configure:3215: checking for ranlib
-configure:3231: found /usr/bin/ranlib
-configure:3242: result: ranlib
-configure:3266: checking for autoconf
-configure:3282: found /usr/bin/autoconf
-configure:3294: result: autoconf
-configure:3304: checking for cp
-configure:3320: found /bin/cp
-configure:3332: result: cp
-configure:3342: checking for rm
-configure:3358: found /bin/rm
-configure:3370: result: rm
-configure:3386: checking for grep that handles long lines and -e
-configure:3444: result: /bin/grep
-configure:3449: checking for egrep
-configure:3511: result: /bin/grep -E
-configure:3516: checking for ANSI C header files
-configure:3536: gcc -c -g -O2 conftest.c >&5
-configure:3536: $? = 0
-configure:3609: gcc -o conftest -g -O2 conftest.c >&5
-configure:3609: $? = 0
-configure:3609: ./conftest
-configure:3609: $? = 0
-configure:3620: result: yes
-configure:3631: checking for setenv
-configure:3631: gcc -o conftest -g -O2 conftest.c >&5
-configure:3631: $? = 0
-configure:3631: result: yes
-configure:3631: checking for putenv
-configure:3631: gcc -o conftest -g -O2 conftest.c >&5
-configure:3631: $? = 0
-configure:3631: result: yes
-configure:3700: checking for tclsh
-configure:3716: found /usr/bin/tclsh
-configure:3727: result: tclsh
-configure:3800: checking for magic
-configure:3818: found /usr/local/bin/magic
-configure:3830: result: /usr/local/bin/magic
-configure:3903: checking for qrouter
-configure:3921: found /usr/local/bin/qrouter
-configure:3933: result: /usr/local/bin/qrouter
-configure:4006: checking for graywolf
-configure:4024: found /usr/local/bin/graywolf
-configure:4036: result: /usr/local/bin/graywolf
-configure:4109: checking for yosys
-configure:4127: found /usr/local/bin/yosys
-configure:4139: result: /usr/local/bin/yosys
-configure:4251: checking for abc
-configure:4284: result: no
-configure:4291: checking for odin_II.exe
-configure:4324: result: no
-configure:4390: checking for odin_II.exe
-configure:4423: result: no
-configure:4494: checking for abc
-configure:4527: result: no
-configure:4751: creating ./config.status
+configure:3037: checking for library containing strerror
+configure:3068: gcc -o conftest -g -O2 conftest.c >&5
+configure:3068: $? = 0
+configure:3085: result: none required
+configure:3110: checking for a BSD-compatible install
+configure:3178: result: /bin/install -c
+configure:3232: checking for ranlib
+configure:3248: found /bin/ranlib
+configure:3259: result: ranlib
+configure:3283: checking for autoconf
+configure:3299: found /bin/autoconf
+configure:3311: result: autoconf
+configure:3321: checking for cp
+configure:3337: found /bin/cp
+configure:3349: result: cp
+configure:3359: checking for rm
+configure:3375: found /bin/rm
+configure:3387: result: rm
+configure:3403: checking for grep that handles long lines and -e
+configure:3461: result: /bin/grep
+configure:3466: checking for egrep
+configure:3528: result: /bin/grep -E
+configure:3533: checking for ANSI C header files
+configure:3553: gcc -c -g -O2 conftest.c >&5
+configure:3553: $? = 0
+configure:3626: gcc -o conftest -g -O2 conftest.c >&5
+configure:3626: $? = 0
+configure:3626: ./conftest
+configure:3626: $? = 0
+configure:3637: result: yes
+configure:3648: checking for setenv
+configure:3648: gcc -o conftest -g -O2 conftest.c >&5
+configure:3648: $? = 0
+configure:3648: result: yes
+configure:3648: checking for putenv
+configure:3648: gcc -o conftest -g -O2 conftest.c >&5
+configure:3648: $? = 0
+configure:3648: result: yes
+configure:3717: checking for tclsh
+configure:3733: found /bin/tclsh
+configure:3744: result: tclsh
+configure:3817: checking for magic
+configure:3835: found /usr/local/bin/magic
+configure:3847: result: /usr/local/bin/magic
+configure:3920: checking for qrouter
+configure:3938: found /usr/local/bin/qrouter
+configure:3950: result: /usr/local/bin/qrouter
+configure:4023: checking for graywolf
+configure:4041: found /usr/local/bin/graywolf
+configure:4053: result: /usr/local/bin/graywolf
+configure:4126: checking for yosys
+configure:4144: found /usr/local/bin/yosys
+configure:4156: result: /usr/local/bin/yosys
+configure:4268: checking for abc
+configure:4301: result: no
+configure:4308: checking for odin_II.exe
+configure:4341: result: no
+configure:4407: checking for odin_II.exe
+configure:4440: result: no
+configure:4511: checking for abc
+configure:4544: result: no
+configure:4768: creating ./config.status
## ---------------------- ##
## Running config.status. ##
## ---------------------- ##
This file was extended by config.status, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES =
CONFIG_HEADERS =
@@ -215,14 +219,14 @@ generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
-on stravinsky.tim.linglan.net
+on stravinsky
-config.status:771: creating Makefile
-config.status:771: creating scripts/Makefile
-config.status:771: creating src/Makefile
-config.status:771: creating tech/Makefile
-config.status:771: creating tech/osu035/Makefile
-config.status:771: creating tech/osu050/Makefile
+config.status:759: creating Makefile
+config.status:759: creating scripts/Makefile
+config.status:759: creating src/Makefile
+config.status:759: creating tech/Makefile
+config.status:759: creating tech/osu035/Makefile
+config.status:759: creating tech/osu050/Makefile
## ---------------- ##
## Cache variables. ##
@@ -259,7 +263,7 @@ ac_cv_path_QFLOW_GRAYWOLF_PATH=/usr/local/bin/graywolf
ac_cv_path_QFLOW_MAGIC_PATH=/usr/local/bin/magic
ac_cv_path_QFLOW_QROUTER_PATH=/usr/local/bin/qrouter
ac_cv_path_QFLOW_YOSYS_PATH=/usr/local/bin/yosys
-ac_cv_path_install='/usr/bin/install -c'
+ac_cv_path_install='/bin/install -c'
ac_cv_prog_AUTOCONF=autoconf
ac_cv_prog_CP=cp
ac_cv_prog_CPP='gcc -E'
diff --git a/config.status b/config.status
index d99415c..0d5cd7a 100755
--- a/config.status
+++ b/config.status
@@ -285,16 +285,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... 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
@@ -354,28 +354,16 @@ else
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'"
@@ -393,7 +381,7 @@ exec 6>&1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -432,16 +420,16 @@ Report bugs to the package provider."
ac_cs_config=""
ac_cs_version="\
config.status
-configured by ./configure, generated by GNU Autoconf 2.68,
+configured by ./configure, 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."
ac_pwd='/home/tim/gitsrc/qflow-1.0'
srcdir='.'
-INSTALL='/usr/bin/install -c'
+INSTALL='/bin/install -c'
test -n "$AWK" || AWK=awk
# The default lists apply if the user does not specify any file.
ac_need_defaults=:
@@ -508,7 +496,7 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- set X '/bin/sh' './configure' $ac_configure_extra_args --no-create --no-recursion
+ set X /bin/sh './configure' $ac_configure_extra_args --no-create --no-recursion
shift
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
CONFIG_SHELL='/bin/sh'
diff --git a/configure b/configure
index 98cac54..a28d487 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68.
+# Generated by GNU Autoconf 2.69.
#
#
-# 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
@@ -134,6 +132,31 @@ export LANGUAGE
# 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
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
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'\" &&
@@ -212,21 +236,25 @@ IFS=$as_save_IFS
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.
- # 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
- export CONFIG_SHELL
- 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+"$@"}
+ 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 :
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
} # 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
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
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).
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... 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
@@ -504,28 +544,8 @@ else
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'"
@@ -1122,8 +1142,6 @@ target=$target_alias
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
@@ -1372,9 +1390,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
configure
-generated by GNU Autoconf 2.68
+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
@@ -1487,7 +1505,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1619,7 +1637,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2111,7 +2129,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
@@ -2151,7 +2169,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
@@ -2204,7 +2222,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
@@ -2245,7 +2263,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
@@ -2303,7 +2321,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
@@ -2347,7 +2365,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ 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
@@ -2793,8 +2811,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* 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);
@@ -3113,7 +3130,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -3186,7 +3203,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3226,7 +3243,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3277,7 +3294,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AUTOCONF="autoconf"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3315,7 +3332,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CP="cp"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3353,7 +3370,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_RM="rm"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3399,7 +3416,7 @@ do
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
@@ -3465,7 +3482,7 @@ do
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
@@ -3670,7 +3687,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_TCLSH_PATH="tclsh"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3711,7 +3728,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_TCLSH_PATH="tclsh"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3770,7 +3787,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_MAGIC_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3813,7 +3830,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_MAGIC_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3873,7 +3890,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_QROUTER_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3916,7 +3933,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_QROUTER_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3976,7 +3993,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_GRAYWOLF_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4019,7 +4036,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_GRAYWOLF_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4079,7 +4096,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_YOSYS_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4122,7 +4139,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_YOSYS_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4181,7 +4198,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ODIN_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4221,7 +4238,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ABC_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4264,7 +4281,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ABC_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4304,7 +4321,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ODIN_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4360,7 +4377,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ODIN_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4403,7 +4420,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ODIN_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4464,7 +4481,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ABC_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4507,7 +4524,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_QFLOW_ABC_PATH="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5041,16 +5058,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... 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
@@ -5110,28 +5127,16 @@ else
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'"
@@ -5153,7 +5158,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -5206,10 +5211,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.68,
+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."
@@ -5287,7 +5292,7 @@ fi
_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'
diff --git a/scripts/Makefile b/scripts/Makefile
index ab160d2..8e76fca 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -7,7 +7,9 @@ CFLAGS = -g -O2
DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"\" -DQFLOW_ABC_PATH=\"\"
LIBS =
LDFLAGS =
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
+
+VERSION = 1.0
QFLOW_LIB_DIR = /usr/local/share/qflow
QFLOW_BIN_DIR = /usr/local/bin
@@ -45,20 +47,21 @@ checkdirs.sh: checkdirs.sh.in
qflow.sh: qflow.sh.in
sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
+ -e '/QFLOW_VERSION/s#QFLOW_VERSION#$(VERSION)#' \
qflow.sh.in > qflow.sh
-
+
install: $(TCL_SCRIPTS) $(SHELL_SCRIPTS) $(MAIN_SCRIPT)
@echo "Installing qflow scripts"
- $(INSTALL) -d ${SCRIPTINSTALL}
+ $(INSTALL) -d $(DESTDIR)${SCRIPTINSTALL}
for target in $(TCL_SCRIPTS); do \
- $(INSTALL) $$target ${SCRIPTINSTALL} ;\
+ $(INSTALL) $$target $(DESTDIR)${SCRIPTINSTALL} ;\
done
for target in $(SHELL_SCRIPTS); do \
- $(INSTALL) $$target ${SCRIPTINSTALL} ;\
+ $(INSTALL) $$target $(DESTDIR)${SCRIPTINSTALL} ;\
done
@echo "Installing qflow executable"
- $(INSTALL) -d ${EXECINSTALL}
- $(INSTALL) ${MAIN_SCRIPT} ${EXECINSTALL}
+ $(INSTALL) -d $(DESTDIR)${EXECINSTALL}
+ $(INSTALL) ${MAIN_SCRIPT} $(DESTDIR)${EXECINSTALL}
clean:
$(RM) $(MAIN_SCRIPT)
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 782c5bd..e5cdf03 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -9,6 +9,8 @@ LIBS = @LIBS@
LDFLAGS = @LDFLAGS@
INSTALL = @INSTALL@
+VERSION = @VERSION@
+
QFLOW_LIB_DIR = @QFLOW_LIB_DIR@
QFLOW_BIN_DIR = @QFLOW_BIN_DIR@
@@ -45,6 +47,7 @@ checkdirs.sh: checkdirs.sh.in
qflow.sh: qflow.sh.in
sed -e '/QFLOW_SCRIPT_DIR/s#QFLOW_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
-e '/QFLOW_DEFAULT_PARSER/s#QFLOW_DEFAULT_PARSER#$(DEFAULTPARSER)#' \
+ -e '/QFLOW_VERSION/s#QFLOW_VERSION#$(VERSION)#' \
qflow.sh.in > qflow.sh
install: $(TCL_SCRIPTS) $(SHELL_SCRIPTS) $(MAIN_SCRIPT)
diff --git a/scripts/qflow.sh.in b/scripts/qflow.sh.in
index 82f3740..de3be3a 100644
--- a/scripts/qflow.sh.in
+++ b/scripts/qflow.sh.in
@@ -4,12 +4,6 @@
# qflow.sh --- main program shell script
#------------------------------------------------------------------
-echo ""
-echo "--------------------------------"
-echo "Qflow project setup"
-echo "--------------------------------"
-echo ""
-
# Environment variable overrides the tech type in all cases except
# when the technology is specified on the command line by -T. If
# the environment variable is not set, the technology defaults to
@@ -55,6 +49,7 @@ set vsource=""
# Don't do anything unless told to on the command line
set actions=0
set dohelp=0
+set doversion=0
set dosynth=0
set doplace=0
set dobuffer=0
@@ -90,6 +85,11 @@ while ($#argv > 0)
set dohelp=1
shift
breaksw
+ case -v:
+ case --version:
+ set doversion=1
+ shift
+ breaksw
case synth:
case synthesize:
set dosynth=1
@@ -161,6 +161,15 @@ while ($#argv > 0)
endsw
end
+if ($doversion == 1 || $dohelp == 1) then
+ echo "Qflow version QFLOW_VERSION"
+ echo ""
+
+ if ($doversion == 1) then
+ exit 0
+ endif
+endif
+
if ($dohelp == 1 || $#argv != 0) then
echo "Usage: qflow [processes] [options] <module_name>"
echo "Processes: synthesize Synthesize verilog source"
@@ -185,6 +194,12 @@ if ($dohelp == 1 || $#argv != 0) then
endif
endif
+echo ""
+echo "--------------------------------"
+echo "Qflow project setup"
+echo "--------------------------------"
+echo ""
+
if ($has_tech == 1) then
echo "Technology set to $tech from existing qflow_vars.sh file"
else if ($has_tech == -1) then
diff --git a/src/Makefile b/src/Makefile
index acef6c4..15c26c2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,7 @@ CFLAGS = -g -O2
DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"\" -DQFLOW_ABC_PATH=\"\"
LIBS =
LDFLAGS =
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
QFLOW_LIB_DIR = /usr/local/share/qflow
QFLOW_GRAYWOLF_PATH = /usr/local/bin/graywolf
@@ -53,22 +53,22 @@ liberty2tech$(EXEEXT): liberty2tech.o
install: $(TARGETS)
@echo "Installing verilog and BDNET file format handlers"
- $(INSTALL) -d ${BININSTALL}
+ $(INSTALL) -d $(DESTDIR)${BININSTALL}
@for target in $(TARGETS); do \
- $(INSTALL) $$target ${BININSTALL} ;\
+ $(INSTALL) $$target $(DESTDIR)${BININSTALL} ;\
done
@echo "Installing links to graywolf, qrouter, odin_ii, and abc"
- (cd ${BININSTALL}; $(RM) -f graywolf; ln -s $(QFLOW_GRAYWOLF_PATH) graywolf)
- (cd ${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f graywolf; ln -s $(QFLOW_GRAYWOLF_PATH) graywolf)
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f qrouter; ln -s $(QFLOW_QROUTER_PATH) qrouter)
@if test "${HAVE_ABC}" = "1"; then \
- (cd ${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f abc; ln -s $(QFLOW_ABC_PATH) abc); \
fi
@if test "${HAVE_ODIN_II}" = "1"; then \
- (cd ${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f odin_ii; ln -s $(QFLOW_ODIN_PATH) odin_ii); \
fi
- (cd ${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f magic; ln -s $(QFLOW_MAGIC_PATH) magic)
@if test "${HAVE_YOSYS}" = "1"; then \
- (cd ${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
+ (cd $(DESTDIR)${BININSTALL}; $(RM) -f yosys; ln -s $(QFLOW_YOSYS_PATH) yosys); \
fi
uninstall:
diff --git a/tech/Makefile b/tech/Makefile
index d14cb82..67d7d8a 100644
--- a/tech/Makefile
+++ b/tech/Makefile
@@ -7,7 +7,7 @@ CFLAGS = -g -O2
DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"\" -DQFLOW_ABC_PATH=\"\"
LIBS =
LDFLAGS =
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
QFLOW_LIB_DIR = /usr/local/share/qflow
@@ -23,7 +23,7 @@ all:
install:
@echo "Installing built-in tech files"
- $(INSTALL) -d ${TECHINSTALL}
+ $(INSTALL) -d $(DESTDIR)${TECHINSTALL}
for target in $(TECH_DIRS); do \
(cd $$target ; $(MAKE) install) ;\
done
diff --git a/tech/osu035/Makefile b/tech/osu035/Makefile
index 4f188cc..b97750e 100644
--- a/tech/osu035/Makefile
+++ b/tech/osu035/Makefile
@@ -7,7 +7,7 @@ CFLAGS = -g -O2
DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"\" -DQFLOW_ABC_PATH=\"\"
LIBS =
LDFLAGS =
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
QFLOW_LIB_DIR = /usr/local/share/qflow
@@ -28,9 +28,9 @@ all: osu035.magicrc.in
install: ${TECH_FILES}
@echo "Installing osu035 tech files"
- $(INSTALL) -d $(TECHINSTALL)/osu035
+ $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu035
for target in $(TECH_FILES); do \
- $(INSTALL) $$target $(TECHINSTALL)/osu035 ;\
+ $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu035 ;\
done
clean:
diff --git a/tech/osu050/Makefile b/tech/osu050/Makefile
index 0cecb6c..1350ad1 100644
--- a/tech/osu050/Makefile
+++ b/tech/osu050/Makefile
@@ -7,7 +7,7 @@ CFLAGS = -g -O2
DEFS = -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DTCLSH_PATH=\"tclsh\" -DQFLOW_MAGIC_PATH=\"/usr/local/bin/magic\" -DQFLOW_QROUTER_PATH=\"/usr/local/bin/qrouter\" -DQFLOW_GRAYWOLF_PATH=\"/usr/local/bin/graywolf\" -DQFLOW_YOSYS_PATH=\"/usr/local/bin/yosys\" -DQFLOW_ODIN_PATH=\"\" -DQFLOW_ABC_PATH=\"\"
LIBS =
LDFLAGS =
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
QFLOW_LIB_DIR = /usr/local/share/qflow
@@ -28,9 +28,9 @@ all: osu050.magicrc.in
install: ${TECH_FILES}
@echo "Installing osu050 tech files"
- $(INSTALL) -d $(TECHINSTALL)/osu050
+ $(INSTALL) -d $(DESTDIR)$(TECHINSTALL)/osu050
for target in $(TECH_FILES); do \
- $(INSTALL) $$target $(TECHINSTALL)/osu050 ;\
+ $(INSTALL) $$target $(DESTDIR)$(TECHINSTALL)/osu050 ;\
done
clean:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qflow.git
More information about the debian-science-commits
mailing list