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
  44 @@ -518,8 +518,8 @@
  45              [HDFEOS2_DIR="$ac_bes_dependencies_prefix"])
  46
  47  AS_IF([test -n "$HDFEOS2_DIR"],
  48 -    [HDFEOS2_CPPFLAGS="-I$HDFEOS2_DIR/include -DUSE_HDFEOS2_LIB"
  49 -    HDFEOS2_LDFLAGS="-L$HDFEOS2_DIR/lib"
  50 +    [AS_IF([test x"$HDFEOS2_DIR" = xyes], [HDFEOS2_CPPFLAGS="-DUSE_HDFEOS2_LIB"], [HDFEOS2_CPPFLAGS="-I$HDFEOS2_DIR/include -DUSE_HDFEOS2_LIB"])
  51 +    AS_IF([test x"$HDFEOS2_DIR" = xyes], [HDFEOS2_LDFLAGS=], [HDFEOS2_LDFLAGS="-L$HDFEOS2_DIR/lib"])
  52      HDFEOS2_LIBS="-lhdfeos -lGctp"
  53      AC_MSG_NOTICE([HDFEOS2 set to true])
  54      AM_CONDITIONAL([HDFEOS2], [true])],
  55 --- bes-3.17.0/conf/hdf4.m4.orig        2015-04-05 05:21:13.650708879 +0200
  56 +++ bes-3.17.0/conf/hdf4.m4     2016-03-28 20:38:01.114526832 +0200
  57 @@ -63,7 +63,7 @@
  58      ],
  59      [
  60        AC_MSG_NOTICE(HDF4_PATH_LIBDIR is NOT set)
  61 -      for ac_hdf4_libdir in /usr/local/hdf4.2r1/lib64 /opt/hdf4.2r1/lib64 \
  62 +      for ac_hdf4_libdir in "" /usr/local/hdf4.2r1/lib64 /opt/hdf4.2r1/lib64 \
  63         /usr/hdf4.2r1/lib64 /usr/local/lib64/hdf4.2r1 /opt/lib64/hdf4.2r1 \
  64         /usr/lib64/hdf4.2r1 /usr/local/hdf/lib64/ /opt/hdf/lib64 \
  65         /usr/hdf/lib64 /usr/local/lib64/hdf /opt/lib64/hdf /usr/lib64/hdf \
  66 @@ -101,7 +101,7 @@
  67      ],
  68      [
  69         AC_MSG_NOTICE(HDF4_PATH_INC is NOT set)
  70 -      for ac_hdf4_incdir in /usr/local/hdf4.2r1/include /opt/hdf4.2r1/include \
  71 +      for ac_hdf4_incdir in "" /usr/local/hdf4.2r1/include /opt/hdf4.2r1/include \
  72         /usr/hdf4.2r1/include /usr/local/include/hdf4.2r1 \
  73         /opt/include/hdf4.2r1 /usr/include/hdf4.2r1 /usr/local/hdf/include \
  74         /opt/hdf/include /usr/hdf/include /usr/local/include/hdf \