bes-configure.patch

   1 --- bes-3.17.0/configure.ac.orig        2016-02-03 19:37:02.308179475 +0100
   2 +++ bes-3.17.0/configure.ac     2016-03-26 09:16:06.978452939 +0100
   3 @@ -406,7 +406,6 @@
   4         [with_openjpeg_prefix=$ac_bes_dependencies_prefix])
   5
   6  save_LIBS=$LIBS
   7 -LIBS="-L$with_openjpeg_prefix/lib $LIBS"
   8  AC_CHECK_LIB(openjp2, opj_version, [OPENJPEG_FOUND="yes"], [OPENJPEG_FOUND="no"], [-lm])
   9  LIBS=$save_LIBS
  10
  11 @@ -457,12 +456,12 @@
  12
  13
  14  ac_cfits_save_LDFLAGS="$LDFLAGS"
  15 -LDFLAGS="$LDFLAGS -L$CFITS_PATH_LIBDIR"
  16 +AS_IF([test -n "$CFITS_PATH_LIBDIR"],[LDFLAGS="$LDFLAGS -L$CFITS_PATH_LIBDIR"])
  17  AC_CHECK_LIB(cfitsio, fits_is_url_absolute,
  18
  19  [ac_cfits_ok='yes'
  20  CFITS_LIBS="-lcfitsio"
  21 -CFITS_LDFLAGS="-L${CFITS_PATH_LIBDIR}"
  22 +AS_IF([test -n "$CFITS_PATH_LIBDIR"], [CFITS_LDFLAGS="-L${CFITS_PATH_LIBDIR}"], [CFITS_LDFLAGS=""])
  23  AC_SUBST([CFITS_LDFLAGS])
  24  AC_SUBST([CFITS_LIBS])],
  25
  26 @@ -474,7 +473,7 @@
  27  CFITS_CPPFLAGS=
  28  ac_cfits_h='no'
  29  ac_cfits_save_CPPFLAGS="$CPPFLAGS"
  30 -CPPFLAGS="$CPPFLAGS -I$CFITS_PATH_INC"
  31 +AS_IF([test -n "$CFITS_PATH_INC"], [CPPFLAGS="$CPPFLAGS -I$CFITS_PATH_INC"])
  32  AC_CHECK_HEADERS([fitsio.h],
  33    [ac_cfits_h='yes'],
  34    [ac_cfits_h='no']
  35 @@ -482,7 +481,7 @@
  36  CPPFLAGS=$ac_cfits_save_CPPFLAGS
  37
  38  AS_IF([test "$ac_cfits_h" = 'yes' ],
  39 -  [CFITS_CPPFLAGS="-I$CFITS_PATH_INC"]
  40 +  [AS_IF([test -n "$CFITS_PATH_INC"], [CFITS_CPPFLAGS="-I$CFITS_PATH_INC"], [CFITS_CPPFLAGS=""])]
  41  )
  42  AC_SUBST([CFITS_CPPFLAGS])
  43