From 5e31ea037370a875533714524c410921c7eb992b Mon Sep 17 00:00:00 2001 From: Diane Bruce Date: Sun, 17 May 2009 12:31:06 +0000 Subject: [PATCH] - Cosmetic changes. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1236 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- aclocal.m4 | 1 - configure.ac | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f4c6dbad2..4cd09488d 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -131,7 +131,6 @@ AC_SUBST(FC_LIB_PATH, "${FC_LIB_PATH}") AC_DEFINE_UNQUOTED(FC, "${FC}", [Fortran compiler.]) AC_SUBST(FC, "${FC}") AC_SUBST(FCV, "${FCV}") -AC_SUBST(PREFIX, "${prefix}") dnl ========================================= dnl pick gfortran or g95 diff --git a/configure.ac b/configure.ac index ec87aec80..ac8a56c0e 100644 --- a/configure.ac +++ b/configure.ac @@ -129,13 +129,6 @@ dnl a custom prefix with a trailing slash prefix=`echo ${ac_default_prefix} | sed 's/\/$//'` fi -AC_DEFINE_UNQUOTED(FC_LIB_PATH, "${FC_LIB_PATH}", [Path to fortran libs.]) -AC_SUBST(FC_LIB_PATH, "${FC_LIB_PATH}") -AC_DEFINE_UNQUOTED(FC, "${FC}", [Fortran compiler.]) -AC_SUBST(FC, "${FC}") -AC_SUBST(FCV, "${FCV}") -AC_SUBST(PREFIX, "${prefix}") - dnl sanity tests. dnl ============= @@ -180,7 +173,7 @@ if test $HAS_FFTW3FLIBS -eq 1; then AC_DEFINE(HAS_FFTW3FLIBS, 1, ) else fail =1 - echo "You are missing the fortran shim libs in libfftw3." + echo "You are missing the fortran shim in libfftw3." fi if test "$F2PY" = ""; then @@ -197,6 +190,7 @@ if test $fail -eq 1; then AC_MSG_ERROR([Please check error messages and install missing packages.]) fi +AC_SUBST(PREFIX, "${prefix}") AC_SUBST(CPPFLAGS, "${CPPFLAGS}") AC_SUBST(LDFLAGS, "${LDFLAGS}") AC_SUBST(LIBS, "${LIBS}")