From 2ff7ea75161065b93fdb39ff15f66c539c712d36 Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Mon, 20 Feb 2006 20:46:33 +0000 Subject: [PATCH] - Check for missing f2py git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@127 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- configure | 14 ++++++++++---- configure.ac | 7 ++++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b3f32868f..41f532230 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.53 for wsjt 5.9.2. # -# $Id: configure.ac 110 2006-01-15 23:32:39Z va3db $ +# $Id: configure.ac 113 2006-01-16 02:07:25Z va3db $ # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -926,7 +926,7 @@ Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -$Id: configure.ac 110 2006-01-15 23:32:39Z va3db $ +$Id: configure.ac 113 2006-01-16 02:07:25Z va3db $ _ACEOF exit 0 fi @@ -5919,6 +5919,11 @@ echo "$as_me: error: You need samplerate.h to use --enable-portaudio" >&2;} fi fi +if test "$F2PY" = ""; then + { { echo "$as_me:$LINENO: error: You are missing f2py" >&5 +echo "$as_me: error: You are missing f2py" >&2;} + { (exit 1); exit 1; }; } +fi CPPFLAGS="${CPPFLAGS}" @@ -5926,7 +5931,6 @@ LDFLAGS="${LDFLAGS}" -ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -6425,7 +6429,6 @@ do case "$ac_config_target" in # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -6763,6 +6766,9 @@ if test "$no_create" != yes; then $ac_cs_success || { (exit 1); exit 1; } fi +ac_config_files="$ac_config_files Makefile" + + echo echo diff --git a/configure.ac b/configure.ac index e33114e20..b072e4cb3 100644 --- a/configure.ac +++ b/configure.ac @@ -314,13 +314,18 @@ if test "$portaudio" = yes; then fi fi +if test "$F2PY" = ""; then + AC_MSG_ERROR([You are missing f2py]) +fi dnl AC_SUBST(CPPFLAGS, "${CPPFLAGS}") AC_SUBST(LDFLAGS, "${LDFLAGS}") AC_SUBST(CFLAGS) -AC_OUTPUT([Makefile]) +AC_OUTPUT +AC_CONFIG_FILES(Makefile) + dnl do summary echo