Mercurial > octave-nkf
changeset 19896:6b851f6acd55
configure.ac: Remove a few more test x"" instances.
* configure.ac: Don't use x"$VAR" for testing enable_shared and enable_static.
Rewrite FFLAGS testing to use -z to avoid testing for x"". Rewrite F77 compiler
existence test to use -n to ovaid testing for x"".
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 25 Feb 2015 12:42:12 -0800 |
| parents | 19755f4fc851 |
| children | 09ed6f7538dd |
| files | configure.ac |
| diffstat | 1 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Feb 25 11:55:49 2015 -0800 +++ b/configure.ac Wed Feb 25 12:42:12 2015 -0800 @@ -601,7 +601,7 @@ ### Determine the Fortran compiler and how to invoke it ## Default FFLAGS is -O. -if test x"$FFLAGS" = x""; then +if test -z "$FFLAGS"; then FFLAGS="-O" fi @@ -615,15 +615,14 @@ AC_MSG_ERROR([g77 is not a supported Fortran compiler. Select another compiler by setting the environment variable F77 and re-running configure.]) fi -AC_MSG_CHECKING([if we have a usable Fortran compiler]) -if test x"$F77" = x""; then +AC_MSG_CHECKING([whether a usable Fortran compiler was found]) +if test -n "$F77"; then + AC_MSG_RESULT(yes) +else AC_MSG_RESULT(no) - AC_MSG_ERROR(No Fortran compiler found) -else - AC_MSG_RESULT(yes) + AC_MSG_ERROR([A Fortran compiler is required]) fi - ## Determine calling conventions for Fortran compiler AC_F77_LIBRARY_LDFLAGS AC_F77_DUMMY_MAIN @@ -1414,13 +1413,13 @@ LT_PREREQ([2.2.2]) LT_INIT([disable-static dlopen win32-dll]) -if test x"$enable_shared" = x"yes"; then +if test $enable_shared = yes; then SHARED_LIBS=yes else SHARED_LIBS=no fi -if test x"$enable_static" = x"yes"; then +if test $enable_static = yes; then STATIC_LIBS=yes else STATIC_LIBS=no