From 813ad010f63ac47e8bd3942762044cc461ed3b9b Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Sat, 11 Nov 1995 01:11:31 +0000 Subject: [PATCH] Check for files in the source directory, not the build directory --- sim/ppc/ChangeLog | 4 ++++ sim/ppc/configure | 8 ++++---- sim/ppc/configure.in | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog index 90d69c69ec..bf04d997b1 100644 --- a/sim/ppc/ChangeLog +++ b/sim/ppc/ChangeLog @@ -1,5 +1,9 @@ Fri Nov 10 06:39:46 1995 Michael Meissner + * configure.in (--enable-sim-{opcode,config}): Use $srcdir when + check for the existence of files. + * configure: Regenerate. + * table.c (table): New field nr_model_fields. (table_open): New parameter nr_model_fields. (table_entry_read): Parse model fields that begin with a '*' after diff --git a/sim/ppc/configure b/sim/ppc/configure index aaa176b777..047100dd56 100755 --- a/sim/ppc/configure +++ b/sim/ppc/configure @@ -486,9 +486,9 @@ enableval="$enable_sim_config" if test -n "$enableval"; then case "${enableval}" in yes|no) { echo "configure: error: "No value supplied for --enable-sim-config=file"" 1>&2; exit 1; };; - *) if test -f "${enableval}"; then + *) if test -f "${srcdir}/${enableval}"; then sim_config="${enableval}"; - elif test -f "${enableval}-config.h"; then + elif test -f "${srcdir}/${enableval}-config.h"; then sim_config="${enableval}-config.h" else { echo "configure: error: "Config file $enableval was not found"" 1>&2; exit 1; }; @@ -510,9 +510,9 @@ enableval="$enable_sim_opcode" if test -n "$enableval"; then case "${enableval}" in yes|no) { echo "configure: error: "No value supplied for --enable-sim-opcode=file"" 1>&2; exit 1; };; - *) if test -f "${enableval}"; then + *) if test -f "${srcdir}/${enableval}"; then sim_opcode="${enableval}" - elif test -f "ppc-opcode-${enableval}"; then + elif test -f "${srcdir}/ppc-opcode-${enableval}"; then sim_opcode="ppc-opcode-${enableval}" else { echo "configure: error: "File $enableval is not an opcode rules file"" 1>&2; exit 1; }; diff --git a/sim/ppc/configure.in b/sim/ppc/configure.in index 012e040445..6ef7afe1fe 100644 --- a/sim/ppc/configure.in +++ b/sim/ppc/configure.in @@ -28,9 +28,9 @@ AC_ARG_ENABLE(sim-config, [ --enable-sim-config=file Override default config file], [case "${enableval}" in yes|no) AC_MSG_ERROR("No value supplied for --enable-sim-config=file");; - *) if test -f "${enableval}"; then + *) if test -f "${srcdir}/${enableval}"; then sim_config="${enableval}"; - elif test -f "${enableval}-config.h"; then + elif test -f "${srcdir}/${enableval}-config.h"; then sim_config="${enableval}-config.h" else AC_MSG_ERROR("Config file $enableval was not found"); @@ -48,9 +48,9 @@ AC_ARG_ENABLE(sim-opcode, [ --enable-sim-opcode=which Override default opcode lookup.], [case "${enableval}" in yes|no) AC_MSG_ERROR("No value supplied for --enable-sim-opcode=file");; - *) if test -f "${enableval}"; then + *) if test -f "${srcdir}/${enableval}"; then sim_opcode="${enableval}" - elif test -f "ppc-opcode-${enableval}"; then + elif test -f "${srcdir}/ppc-opcode-${enableval}"; then sim_opcode="ppc-opcode-${enableval}" else AC_MSG_ERROR("File $enableval is not an opcode rules file");