mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-24 10:22:26 -04:00
- Cosmetic changes.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1236 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
007a6e70b8
commit
5e31ea0373
1
aclocal.m4
vendored
1
aclocal.m4
vendored
@ -131,7 +131,6 @@ AC_SUBST(FC_LIB_PATH, "${FC_LIB_PATH}")
|
|||||||
AC_DEFINE_UNQUOTED(FC, "${FC}", [Fortran compiler.])
|
AC_DEFINE_UNQUOTED(FC, "${FC}", [Fortran compiler.])
|
||||||
AC_SUBST(FC, "${FC}")
|
AC_SUBST(FC, "${FC}")
|
||||||
AC_SUBST(FCV, "${FCV}")
|
AC_SUBST(FCV, "${FCV}")
|
||||||
AC_SUBST(PREFIX, "${prefix}")
|
|
||||||
|
|
||||||
dnl =========================================
|
dnl =========================================
|
||||||
dnl pick gfortran or g95
|
dnl pick gfortran or g95
|
||||||
|
10
configure.ac
10
configure.ac
@ -129,13 +129,6 @@ dnl a custom prefix with a trailing slash
|
|||||||
prefix=`echo ${ac_default_prefix} | sed 's/\/$//'`
|
prefix=`echo ${ac_default_prefix} | sed 's/\/$//'`
|
||||||
fi
|
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 sanity tests.
|
||||||
dnl =============
|
dnl =============
|
||||||
|
|
||||||
@ -180,7 +173,7 @@ if test $HAS_FFTW3FLIBS -eq 1; then
|
|||||||
AC_DEFINE(HAS_FFTW3FLIBS, 1, )
|
AC_DEFINE(HAS_FFTW3FLIBS, 1, )
|
||||||
else
|
else
|
||||||
fail =1
|
fail =1
|
||||||
echo "You are missing the fortran shim libs in libfftw3."
|
echo "You are missing the fortran shim in libfftw3."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$F2PY" = ""; then
|
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.])
|
AC_MSG_ERROR([Please check error messages and install missing packages.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(PREFIX, "${prefix}")
|
||||||
AC_SUBST(CPPFLAGS, "${CPPFLAGS}")
|
AC_SUBST(CPPFLAGS, "${CPPFLAGS}")
|
||||||
AC_SUBST(LDFLAGS, "${LDFLAGS}")
|
AC_SUBST(LDFLAGS, "${LDFLAGS}")
|
||||||
AC_SUBST(LIBS, "${LIBS}")
|
AC_SUBST(LIBS, "${LIBS}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user