Corrected build setup according to comments from dbm
authorAnders Henja <anders@baltrad.eu>
Tue, 30 Aug 2011 07:36:58 +0000 (09:36 +0200)
committerAnders Henja <anders@baltrad.eu>
Tue, 30 Aug 2011 07:36:58 +0000 (09:36 +0200)
106 files changed:
configure
configure.in
drain/Makefile
drain/image/CatenatorOp.h
drain/image/CoordinateHandler.cpp
drain/image/CoordinateHandler.h
drain/image/CopyOp.h
drain/image/Cumulator.h
drain/image/DistanceTransformFillOp.h
drain/image/DistanceTransformOp.h
drain/image/DoubleSmootherOp.h
drain/image/Drain.h
drain/image/FastAverageOp.h
drain/image/FastOpticalFlowOp.h
drain/image/File.h
drain/image/FileBinary.cpp
drain/image/FileBinary.h
drain/image/FileFQD.cpp
drain/image/FileFQD.h
drain/image/FilePng.h
drain/image/FloodFillOp.h
drain/image/FuzzyPeakOp.h
drain/image/FuzzyThresholdOp.h
drain/image/GammaOp.h
drain/image/Geometry.cpp
drain/image/GradientOp.h
drain/image/HighBoostOp.h
drain/image/HighPassOp.h
drain/image/Image.h
drain/image/ImageOp.h
drain/image/ImageView.h
drain/image/MagickDrain.h
drain/image/MarginalStatisticOp.h
drain/image/MathOpPack.h
drain/image/PaletteOp.h
drain/image/PixelVectorOp.h
drain/image/QuadraticSmootherOp.h
drain/image/QualityOverrideOp.h
drain/image/QuantizatorOp.h
drain/image/RecursiveRepairerOp.h
drain/image/RunLengthOp.h
drain/image/SegmentAreaOp.h
drain/image/SequentialImageOp.h
drain/image/SlidingStripeOp.h
drain/image/SlidingWindow.h
drain/image/SlidingWindowHistogram.h
drain/image/SlidingWindowMedianOp.h
drain/image/SlidingWindowOp.h
drain/image/ThresholdOp.h
drain/image/WindowOp.h
drain/radar/Andre.h
drain/radar/Composite.cpp
drain/radar/Composite.h
drain/radar/Coordinates.cpp
drain/radar/Coordinates.h
drain/radar/Geometry.cpp
drain/radar/PolarAttenuation.h
drain/radar/PolarCappi.h
drain/radar/PolarCoordinateHandler.cpp
drain/radar/PolarCoordinateHandler.h
drain/radar/PolarEchoTop.h
drain/radar/PolarMaxEcho.h
drain/radar/PolarProduct.h
drain/radar/PolarToCartesian.h
drain/radar/PolarToGeographical.h
drain/radar/ProductXReader.cpp
drain/radar/ProductXReader.h
drain/radar/SubComposite.cpp
drain/radar/SubComposite.h
drain/util/Data.cpp
drain/util/Debug.cpp
drain/util/MapReader.h
drain/util/Options.cpp
drain/util/Options.h
drain/util/Proj4.cpp
drain/util/ProjectionFrame.cpp
drain/util/ProjectionFrame.h
drain/util/RegExp.cpp
drain/util/String.cpp
drain/util/String.h
drain/util/StringMapper.h
drain/util/TreeNode.h
pyrack/Makefile
rack/Makefile
rack/hi5/RaveConvert.cpp
rack/rack/RackIf.cpp
rack/ropo/Ropo.cpp
rack/ropo/Ropo.h
rack/ropo/convertImage.cpp
rack/ropo/convertImage.h
rack/ropo/fmi_image.c
rack/ropo/fmi_image_arith.c
rack/ropo/fmi_image_filter.c
rack/ropo/fmi_image_filter_line.c
rack/ropo/fmi_image_filter_morpho.c
rack/ropo/fmi_image_filter_speck.c
rack/ropo/fmi_image_filter_texture.c
rack/ropo/fmi_image_histogram.c
rack/ropo/fmi_image_restore.c
rack/ropo/fmi_image_restore.h
rack/ropo/fmi_meteosat.c
rack/ropo/fmi_meteosat.h
rack/ropo/fmi_radar_image.c
rack/ropo/fmi_radar_image.h
rack/ropo/fmi_util.c
rack/ropo/ropo_hdf.c

index 78ab7c8..1325d3b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1296,7 +1296,7 @@ if test -n "$ac_init_help"; then
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-rave=ROOT  The rave root installation directory
+  --with-rave=ROOT  The RAVE root installation directory
  --with-png=ROOT or INC,LIB Use the PNG library
   --with-magick=BIN  The Magick++-config file
 
@@ -3114,6 +3114,683 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+                    Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5 ; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5 ; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+        CFLAGS="-g"
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+       -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 
 LIBS=-lm
 
@@ -3130,11 +3807,11 @@ fi
 
 case $withval in
   no)
-    as_fn_error $? "You can not remove dependencies to rave" "$LINENO" 5 ;
+    as_fn_error $? "You cannot remove dependencies to RAVE" "$LINENO" 5 ;
     ;;
   *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rave installation" >&5
-$as_echo_n "checking for rave installation... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAVE installation" >&5
+$as_echo_n "checking for RAVE installation... " >&6; }
     TMPDIR=
     if [ "yes" = "$withval" ]; then
       TMPFIL=`python -c "import _rave; print eval(\"_rave.__\"+\"file__\")" 2>&1 | egrep -v "Objects created|deleted|pending"`
@@ -3158,11 +3835,11 @@ $as_echo "found" >&6; }
 esac
 
 if [ "$RAVE_ROOT_DIR" = "" ]; then
-  as_fn_error $? "\"Could not identify a rave installation\"" "$LINENO" 5
+  as_fn_error $? "\"Could not identify a RAVE installation\"" "$LINENO" 5
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existance of rave build configuration" >&5
-$as_echo_n "checking existance of rave build configuration... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking existance of RAVE build configuration" >&5
+$as_echo_n "checking existance of RAVE build configuration... " >&6; }
 if [ -f "$RAVE_ROOT_DIR/mkf/def.mk" ]; then
   RAVE_INCLUDE_FLAG=-I$RAVE_ROOT_DIR/include
   RAVE_LIB_FLAG=-L$RAVE_ROOT_DIR/lib
@@ -3173,18 +3850,18 @@ else
 $as_echo "not found" >&6; };
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The rave installation does not contain def.mk. Is this an old installation
+as_fn_error $? "The RAVE installation does not contain def.mk. Is this an old installation
 See \`config.log' for more details" "$LINENO" 5 ; };
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rave cc compiler" >&5
-$as_echo_n "checking for rave cc compiler... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAVE cc compiler" >&5
+$as_echo_n "checking for RAVE cc compiler... " >&6; }
 RAVECC=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^CC=/p" | sed -n -e"s/^CC=[ \t]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAVECC" >&5
 $as_echo "$RAVECC" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rave cc options" >&5
-$as_echo_n "checking for rave cc options... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAVE cc options" >&5
+$as_echo_n "checking for RAVE cc options... " >&6; }
 RAVECCOPTS=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^OPTS=/p" | sed -n -e"s/^OPTS=[   ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAVECCOPTS" >&5
 $as_echo "$RAVECCOPTS" >&6; }
@@ -3195,20 +3872,20 @@ CPPOPTS=`echo "$RAVECCOPTS" | sed -e "s/-Wstrict-prototypes//"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPOPTS" >&5
 $as_echo "$CPPOPTS" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rave ld flags" >&5
-$as_echo_n "checking for rave ld flags... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAVE ld flags" >&5
+$as_echo_n "checking for RAVE ld flags... " >&6; }
 RAVELDFLAGS=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^LDFLAGS=/p" | sed -n -e"s/^LDFLAGS=[    ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAVELDFLAGS" >&5
 $as_echo "$RAVELDFLAGS" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rave shared flag" >&5
-$as_echo_n "checking for rave shared flag... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAVE shared flag" >&5
+$as_echo_n "checking for RAVE shared flag... " >&6; }
 RAVECCSHARED=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^CCSHARED=/p" | sed -n -e"s/^CCSHARED=[         ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAVECCSHARED" >&5
 $as_echo "$RAVECCSHARED" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python include flag" >&5
-$as_echo_n "checking for python include flag... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python include flag" >&5
+$as_echo_n "checking for Python include flag... " >&6; }
 PYTHON_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^INCLUDE_PYTHON=/p" | sed -n -e"s/^INCLUDE_PYTHON=[      ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INCLUDE_PYTHON" >&5
 $as_echo "$INCLUDE_PYTHON" >&6; }
@@ -3219,26 +3896,26 @@ NUMPY_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^NUMPY_INCLUDE_DIR=
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROJ_INCLUDE_FLAG" >&5
 $as_echo "$PROJ_INCLUDE_FLAG" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj include flag used by rave" >&5
-$as_echo_n "checking for proj include flag used by rave... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj include flag used by RAVE" >&5
+$as_echo_n "checking for proj include flag used by RAVE... " >&6; }
 PROJ_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^PROJ_INCLUDE_DIR=/p" | sed -n -e"s/^PROJ_INCLUDE_DIR=[    ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROJ_INCLUDE_FLAG" >&5
 $as_echo "$PROJ_INCLUDE_FLAG" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj library flag used by rave" >&5
-$as_echo_n "checking for proj library flag used by rave... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for proj library flag used by RAVE" >&5
+$as_echo_n "checking for proj library flag used by RAVE... " >&6; }
 PROJ_LIBRARY_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^PROJ_LIB_DIR=/p" | sed -n -e"s/^PROJ_LIB_DIR=[    ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROJ_INCLUDE_FLAG" >&5
 $as_echo "$PROJ_INCLUDE_FLAG" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat include flag used by rave" >&5
-$as_echo_n "checking for expat include flag used by rave... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat include flag used by RAVE" >&5
+$as_echo_n "checking for expat include flag used by RAVE... " >&6; }
 EXPAT_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^EXPAT_INCLUDE_DIR=/p" | sed -n -e"s/^EXPAT_INCLUDE_DIR=[         ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPAT_INCLUDE_FLAG" >&5
 $as_echo "$EXPAT_INCLUDE_FLAG" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat library flag used by rave" >&5
-$as_echo_n "checking for expat library flag used by rave... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat library flag used by RAVE" >&5
+$as_echo_n "checking for expat library flag used by RAVE... " >&6; }
 EXPAT_LIBRARY_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^EXPAT_LIB_DIR=/p" | sed -n -e"s/^EXPAT_LIB_DIR=[         ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPAT_INCLUDE_FLAG" >&5
 $as_echo "$EXPAT_INCLUDE_FLAG" >&6; }
@@ -3249,14 +3926,14 @@ EXPAT_SUPPRESSED=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^EXPAT_SUPPRESSED=/p"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXPAT_SUPPRESSED" >&5
 $as_echo "$EXPAT_SUPPRESSED" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hlhdf include flag used by rave" >&5
-$as_echo_n "checking for hlhdf include flag used by rave... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hlhdf include flag used by RAVE" >&5
+$as_echo_n "checking for hlhdf include flag used by RAVE... " >&6; }
 HLHDF_INCLUDE_FLAG=-I`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^HLHDF_INCLUDE_DIR=/p" | sed -n -e"s/^HLHDF_INCLUDE_DIR=[       ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HLHDF_INCLUDE_FLAG" >&5
 $as_echo "$HLHDF_INCLUDE_FLAG" >&6; }
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hlhdf library flag used by rave" >&5
-$as_echo_n "checking for hlhdf library flag used by rave... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hlhdf library flag used by RAVE" >&5
+$as_echo_n "checking for hlhdf library flag used by RAVE... " >&6; }
 HLHDF_LIBRARY_FLAG=-L`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^HLHDF_LIB_DIR=/p" | sed -n -e"s/^HLHDF_LIB_DIR=[       ]*\(.*\)/\1/p"`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HLHDF_LIBRARY_FLAG" >&5
 $as_echo "$HLHDF_LIBRARY_FLAG" >&6; }
@@ -3314,143 +3991,6 @@ fi
 case $withval in
   yes)
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-                    Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
@@ -3796,9 +4336,9 @@ fi
 done
 
         if [ "$GOT_PNG_INC" = "yes" ]; then
-          PNG_INCLUDE_DIR="$png_inc"
+          PNG_INCLUDE_DIR=-I"$png_inc"
         fi
-        CPPFLAGS="$saved_CPPFLAGS"
+        CCFLAGS="$saved_CCFLAGS"
       else
         for ac_header in png.h
 do :
@@ -3858,7 +4398,7 @@ if test "x$ac_cv_lib_png_png_get_image_width" = x""yes; then :
 fi
 
         if [ "$GOT_PNG_LIB" = "yes" ]; then
-          PNG_LIB_DIR="$png_lib"
+          PNG_LIB_DIR=-L"$png_lib"
         else
           LDFLAGS="$saved_LDFLAGS"
         fi
index 4216bdc..407d8ba 100644 (file)
@@ -9,6 +9,7 @@ if test "${prefix}" = "NONE"; then
 fi
 
 AC_PROG_CXX
+AC_PROG_CPP
 AC_PROG_CC
 
 LIBS=-lm
@@ -18,14 +19,14 @@ dnl
 RAVE_ROOT_DIR=
 RAVE_INCLUDE_FLAG=
 RAVE_LIB_FLAG=
-AC_ARG_WITH(rave,[  --with-rave=ROOT  The rave root installation directory],
+AC_ARG_WITH(rave,[  --with-rave=ROOT  The RAVE root installation directory],
      ,withval=yes)
 case $withval in
   no)
-    AC_MSG_ERROR(You can not remove dependencies to rave);
+    AC_MSG_ERROR(You cannot remove dependencies to RAVE);
     ;;
   *)
-    AC_MSG_CHECKING(for rave installation)
+    AC_MSG_CHECKING(for RAVE installation)
     TMPDIR=
     if [[ "yes" = "$withval" ]]; then
       TMPFIL=`python -c "import _rave; print eval(\"_rave.__\"+\"file__\")" 2>&1 | egrep -v "Objects [created|deleted|pending]"`
@@ -47,26 +48,26 @@ case $withval in
 esac
 
 if [[ "$RAVE_ROOT_DIR" = "" ]]; then
-  AC_MSG_ERROR("Could not identify a rave installation")
+  AC_MSG_ERROR("Could not identify a RAVE installation")
 fi
 
-AC_MSG_CHECKING(existance of rave build configuration)
+AC_MSG_CHECKING(existance of RAVE build configuration)
 if [[ -f "$RAVE_ROOT_DIR/mkf/def.mk" ]]; then
   RAVE_INCLUDE_FLAG=-I$RAVE_ROOT_DIR/include
   RAVE_LIB_FLAG=-L$RAVE_ROOT_DIR/lib
   AC_MSG_RESULT(found)
 else
   AC_MSG_RESULT(not found);
-  AC_MSG_FAILURE(The rave installation does not contain def.mk. Is this an old installation);
+  AC_MSG_FAILURE(The RAVE installation does not contain def.mk. Is this an old installation);
 fi
 
 dnl Now we should extract some variables from raves def.mk file to give user a possibility to change
 dnl then when necessary
-AC_MSG_CHECKING(for rave cc compiler)
+AC_MSG_CHECKING(for RAVE cc compiler)
 RAVECC=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^CC=/p" | sed -n -e"s/^CC=[[ \t]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($RAVECC)
 
-AC_MSG_CHECKING(for rave cc options)
+AC_MSG_CHECKING(for RAVE cc options)
 RAVECCOPTS=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^OPTS=/p" | sed -n -e"s/^OPTS=[[  ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($RAVECCOPTS)
 
@@ -76,15 +77,15 @@ AC_MSG_CHECKING(for cpp options)
 CPPOPTS=`echo "$RAVECCOPTS" | sed -e "s/-Wstrict-prototypes//"`
 AC_MSG_RESULT($CPPOPTS)
 
-AC_MSG_CHECKING(for rave ld flags)
+AC_MSG_CHECKING(for RAVE ld flags)
 RAVELDFLAGS=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^LDFLAGS=/p" | sed -n -e"s/^LDFLAGS=[[   ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($RAVELDFLAGS)
 
-AC_MSG_CHECKING(for rave shared flag)
+AC_MSG_CHECKING(for RAVE shared flag)
 RAVECCSHARED=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^CCSHARED=/p" | sed -n -e"s/^CCSHARED=[[        ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($RAVECCSHARED)
 
-AC_MSG_CHECKING(for python include flag)
+AC_MSG_CHECKING(for Python include flag)
 PYTHON_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^INCLUDE_PYTHON=/p" | sed -n -e"s/^INCLUDE_PYTHON=[[     ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($INCLUDE_PYTHON)
 
@@ -92,19 +93,19 @@ AC_MSG_CHECKING(for numpy include flag)
 NUMPY_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^NUMPY_INCLUDE_DIR=/p" | sed -n -e"s/^NUMPY_INCLUDE_DIR=[[        ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($PROJ_INCLUDE_FLAG)
 
-AC_MSG_CHECKING(for proj include flag used by rave)
+AC_MSG_CHECKING(for proj include flag used by RAVE)
 PROJ_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^PROJ_INCLUDE_DIR=/p" | sed -n -e"s/^PROJ_INCLUDE_DIR=[[   ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($PROJ_INCLUDE_FLAG)
 
-AC_MSG_CHECKING(for proj library flag used by rave)
+AC_MSG_CHECKING(for proj library flag used by RAVE)
 PROJ_LIBRARY_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^PROJ_LIB_DIR=/p" | sed -n -e"s/^PROJ_LIB_DIR=[[   ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($PROJ_INCLUDE_FLAG)
 
-AC_MSG_CHECKING(for expat include flag used by rave)
+AC_MSG_CHECKING(for expat include flag used by RAVE)
 EXPAT_INCLUDE_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^EXPAT_INCLUDE_DIR=/p" | sed -n -e"s/^EXPAT_INCLUDE_DIR=[[        ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($EXPAT_INCLUDE_FLAG)
 
-AC_MSG_CHECKING(for expat library flag used by rave)
+AC_MSG_CHECKING(for expat library flag used by RAVE)
 EXPAT_LIBRARY_FLAG=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^EXPAT_LIB_DIR=/p" | sed -n -e"s/^EXPAT_LIB_DIR=[[        ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($EXPAT_INCLUDE_FLAG)
 
@@ -112,11 +113,11 @@ AC_MSG_CHECKING(if expat is supressed)
 EXPAT_SUPPRESSED=`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^EXPAT_SUPPRESSED=/p" | sed -n -e"s/^EXPAT_SUPPRESSED=[[    ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($EXPAT_SUPPRESSED)
 
-AC_MSG_CHECKING(for hlhdf include flag used by rave)
+AC_MSG_CHECKING(for hlhdf include flag used by RAVE)
 HLHDF_INCLUDE_FLAG=-I`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^HLHDF_INCLUDE_DIR=/p" | sed -n -e"s/^HLHDF_INCLUDE_DIR=[[      ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($HLHDF_INCLUDE_FLAG)
 
-AC_MSG_CHECKING(for hlhdf library flag used by rave)
+AC_MSG_CHECKING(for hlhdf library flag used by RAVE)
 HLHDF_LIBRARY_FLAG=-L`cat $RAVE_ROOT_DIR/mkf/def.mk | sed -n "/^HLHDF_LIB_DIR=/p" | sed -n -e"s/^HLHDF_LIB_DIR=[[      ]]*\(.*\)/\1/p"`
 AC_MSG_RESULT($HLHDF_LIBRARY_FLAG)
 
@@ -177,9 +178,9 @@ case $withval in
         CPPFLAGS="$CPPFLAGS -I$png_inc"
         AC_CHECK_HEADERS(png.h,GOT_PNG_INC=yes)
         if [[ "$GOT_PNG_INC" = "yes" ]]; then
-          PNG_INCLUDE_DIR="$png_inc"
+          PNG_INCLUDE_DIR=-I"$png_inc"
         fi
-        CPPFLAGS="$saved_CPPFLAGS"
+        CCFLAGS="$saved_CCFLAGS"
       else
         AC_CHECK_HEADERS(png.h,GOT_PNG_INC=yes)
       fi
@@ -189,7 +190,7 @@ case $withval in
         LDFLAGS="$LDFLAGS -L$png_lib"
         AC_CHECK_LIB(png, png_get_image_width, GOT_PNG_LIB=yes)
         if [[ "$GOT_PNG_LIB" = "yes" ]]; then
-          PNG_LIB_DIR="$png_lib"
+          PNG_LIB_DIR=-L"$png_lib"
         else
           LDFLAGS="$saved_LDFLAGS"
         fi
index 4367107..8f9bb6a 100644 (file)
@@ -26,7 +26,7 @@
 
 # Drain specific cpp flags
 #
-CPPFLAGS= $(SHARED_FLAG) $(CPPOPTS) $(DEFS) -I. -I./image -I./radar -I./util -I.. $(PROJ_INCLUDE_FLAG) $(PNG_INCLUDE_DIR)
+CPPFLAGS= $(SHARED_FLAG) $(CPPOPTS) $(DEFS) -I..  $(PROJ_INCLUDE_FLAG) $(PNG_INCLUDE_DIR)
 
 ifeq ($(WITH_MAGICK), no)
 CPPFLAGS+= -DRAIN_MAGICK_no
index 4a34a7e..1a1ed66 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef CATENATOROP_H_
 #define CATENATOROP_H_
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index bfdbb6a..8bd944a 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "CoordinateHandler.h"
+#include "drain/image/CoordinateHandler.h"
 
 namespace drain
 {
index d873e8f..84d884c 100644 (file)
@@ -23,7 +23,7 @@
 #define COORDINATEHANDLER_H_
 
 
-#include "Point.h"
+#include "drain/image/Point.h"
 
 namespace drain
 {
index 37a12d8..7509408 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef COPYOP_H_
 #define COPYOP_H_
 
-#include "SequentialImageOp.h"
+#include "drain/image/SequentialImageOp.h"
 
 namespace drain
 {
index 3ffa9bd..8c54eb2 100644 (file)
@@ -31,9 +31,9 @@
 
 #include <stdexcept>
 
-#include "Point.h"
-#include "Image.h"
-#include "CoordinateHandler.h" 
+#include "drain/image/Point.h"
+#include "drain/image/Image.h"
+#include "drain/image/CoordinateHandler.h"
 
 
 
index 8bf5665..fa28d16 100644 (file)
@@ -26,7 +26,7 @@
        //#include "Operator.h"
        //#include "Point.h"
        
-#include "DistanceTransformOp.h"
+#include "drain/image/DistanceTransformOp.h"
 //#include "File.h"
        
        
index 7f03d39..4c0feb7 100644 (file)
@@ -26,7 +26,7 @@
 #include <math.h>
 
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index 35021dc..7a36d92 100644 (file)
 #ifndef Double_SMOOTHEROP
 #define Double_SMOOTHEROP "DoubleSmootherOp Markus.Peura@iki.fi"
 
-#include "WindowOp.h"
+#include "drain/image/WindowOp.h"
 
-#include "FastAverageOp.h"
-#include "MathOpPack.h"
+#include "drain/image/FastAverageOp.h"
+#include "drain/image/MathOpPack.h"
 //#include "SlidingStripeAverageOp.h"
 
 namespace drain
index 1d75bfa..4106aac 100644 (file)
 #include <exception>
 
 
-#include "Image.h"
-#include "CatenatorOp.h"
-#include "CopyOp.h"
-#include "DoubleSmootherOp.h"
-#include "DistanceTransformOp.h"
+#include "drain/image/Image.h"
+#include "drain/image/CatenatorOp.h"
+#include "drain/image/CopyOp.h"
+#include "drain/image/DoubleSmootherOp.h"
+#include "drain/image/DistanceTransformOp.h"
 //#include "DistanceTransformLogOp.h"
-#include "DistanceTransformFillOp.h"
-#include "FastAverageOp.h"
-#include "FastOpticalFlowOp.h"
-#include "FloodFillOp.h"
-#include "FuzzyPeakOp.h"
-#include "FuzzyThresholdOp.h"
-#include "GammaOp.h"
-#include "GradientOp.h"
-#include "HighPassOp.h"
-#include "MarginalStatisticOp.h"
-#include "MathOpPack.h"
-#include "PaletteOp.h"
-#include "PixelVectorOp.h"
-#include "QuadraticSmootherOp.h"
-#include "QuantizatorOp.h"
-#include "RecursiveRepairerOp.h"
-#include "RunLengthOp.h"
-#include "SegmentAreaOp.h"
-#include "SlidingStripeOp.h"
+#include "drain/image/DistanceTransformFillOp.h"
+#include "drain/image/FastAverageOp.h"
+#include "drain/image/FastOpticalFlowOp.h"
+#include "drain/image/FloodFillOp.h"
+#include "drain/image/FuzzyPeakOp.h"
+#include "drain/image/FuzzyThresholdOp.h"
+#include "drain/image/GammaOp.h"
+#include "drain/image/GradientOp.h"
+#include "drain/image/HighPassOp.h"
+#include "drain/image/MarginalStatisticOp.h"
+#include "drain/image/MathOpPack.h"
+#include "drain/image/PaletteOp.h"
+#include "drain/image/PixelVectorOp.h"
+#include "drain/image/QuadraticSmootherOp.h"
+#include "drain/image/QuantizatorOp.h"
+#include "drain/image/RecursiveRepairerOp.h"
+#include "drain/image/RunLengthOp.h"
+#include "drain/image/SegmentAreaOp.h"
+#include "drain/image/SlidingStripeOp.h"
 //#include "SlidingStripeAverageOp.h"
 //#include "SlidingStripeAverageWeightedOp.h"
-#include "SlidingWindowMedianOp.h"
-#include "ThresholdOp.h"
+#include "drain/image/SlidingWindowMedianOp.h"
+#include "drain/image/ThresholdOp.h"
 
 //#include ""
 
index 6b654e9..a51682a 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef FASTAVERAGEOP_H_
 #define FASTAVERAGEOP_H_
 
-#include "SlidingStripeOp.h"
-#include "WindowOp.h"
+#include "drain/image/SlidingStripeOp.h"
+#include "drain/image/WindowOp.h"
 
 namespace drain
 {
index 2d0239b..eec6abc 100644 (file)
 
 #include <sstream>
 
-#include "SlidingWindow.h"
-#include "SlidingWindowOp.h"
+#include "drain/image/SlidingWindow.h"
+#include "drain/image/SlidingWindowOp.h"
 
 //#include "FastAverageOp.h"
-#include "DoubleSmootherOp.h"
-#include "FuzzyPeakOp.h"
-#include "GradientOp.h"
-#include "PixelVectorOp.h"
-#include "QuadraticSmootherOp.h"
-#include "RecursiveRepairerOp.h"
+#include "drain/image/DoubleSmootherOp.h"
+#include "drain/image/FuzzyPeakOp.h"
+#include "drain/image/GradientOp.h"
+#include "drain/image/PixelVectorOp.h"
+#include "drain/image/QuadraticSmootherOp.h"
+#include "drain/image/RecursiveRepairerOp.h"
 
 namespace drain
 {
index 991da9c..bd2f025 100644 (file)
 #ifndef DRAIN_FILE_H_
 #define DRAIN_FILE_H_
 
-#include "MagickDrain.h"
-#include "FilePng.h"
+#include "drain/image/MagickDrain.h"
+#include "drain/image/FilePng.h"
 
 #include <string>
 
-#include "Image.h"
+#include "drain/image/Image.h"
 
 
 namespace drain
index 4cc1e5a..f9c581e 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "FileBinary.h"
+#include "drain/image/FileBinary.h"
 
 
 #include <fstream>
index 7baf348..6935bc2 100644 (file)
@@ -29,7 +29,7 @@
 
 
 
-#include "Image.h"
+#include "drain/image/Image.h"
 
 
 namespace drain
index 9afe084..1086041 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "FileFQD.h"
+#include "drain/image/FileFQD.h"
 
 
 #include <fstream>
index 5073db9..04869c9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include "Image.h"
+#include "drain/image/Image.h"
 
 
 namespace drain
index fa624d8..0ee0c2a 100644 (file)
@@ -30,8 +30,8 @@
 
 #include <png.h>
 
-#include "Image.h"
-#include "../util/Time.h"
+#include "drain/image/Image.h"
+#include "drain/util/Time.h"
 
 
 namespace drain
index c3000f5..078c63b 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef FLOODFILL2_H
 #define FLOODFILL2_H
 
-#include "ImageOp.h"
-#include "CoordinateHandler.h"
+#include "drain/image/ImageOp.h"
+#include "drain/image/CoordinateHandler.h"
 
 
 namespace drain
index 53a2892..3d2d69d 100644 (file)
@@ -25,7 +25,7 @@
 #include <math.h>
 
 
-#include "SequentialImageOp.h"
+#include "drain/image/SequentialImageOp.h"
 
 using namespace std;
 
index c2ab121..7e54ab0 100644 (file)
@@ -26,7 +26,7 @@
 
 
 //#include "SequentialImageOp.h"
-#include "ThresholdOp.h"
+#include "drain/image/ThresholdOp.h"
 
 using namespace std;
 
index 858fb39..9568b97 100644 (file)
@@ -27,7 +27,7 @@
 //#include <limits>
 
 //#include "BufferedImage.h"
-#include "SequentialImageOp.h"
+#include "drain/image/SequentialImageOp.h"
 
 using namespace std;
 
index e38892d..9315b5a 100644 (file)
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "Geometry.h"
+#include "drain/image/Geometry.h"
 //#include "DistanceTransformOp.h"
 
 namespace drain
index 0b7f6aa..c9264da 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <math.h>
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index 6beae46..98a9342 100644 (file)
 #define HIGHBOOSTOP_H_
 
 //#include "SlidingWindowAverage.h"
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
-#include "FastAverageOp.h"
-#include "MathOpPack.h"
+#include "drain/image/FastAverageOp.h"
+#include "drain/image/MathOpPack.h"
 
 
 namespace drain
index 4539a98..1ea27c6 100644 (file)
 #define HIGHPASSOP_H_
 
 //#include "SlidingWindowAverage.h"
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
-#include "FastAverageOp.h"
-#include "MathOpPack.h"
+#include "drain/image/FastAverageOp.h"
+#include "drain/image/MathOpPack.h"
 
 
 namespace drain
index 61460fd..7945bf4 100644 (file)
 #include <vector>
 #include <ostream>
 
-#include "../util/Debug.h"
-#include "../util/Options.h"
-#include "Geometry.h"
+#include "drain/util/Debug.h"
+#include "drain/util/Options.h"
+#include "drain/image/Geometry.h"
 
-#include "Intensity.h"
-#include "CoordinateHandler.h"
-#include "ImageView.h"
+#include "drain/image/Intensity.h"
+#include "drain/image/CoordinateHandler.h"
+#include "drain/image/ImageView.h"
 
-#include "Point.h"
+#include "drain/image/Point.h"
 
 
 namespace drain
index 7839009..ac3933b 100644 (file)
@@ -26,7 +26,7 @@
 #include <stdexcept>
 #include <list>
 
-#include "Image.h"
+#include "drain/image/Image.h"
 
 namespace drain
 {
index 15dfcaf..9dad222 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <sstream> 
 #include <stdexcept>
-#include "Image.h"
+#include "drain/image/Image.h"
 
 namespace drain
 {
index b4ac08a..b62d117 100644 (file)
@@ -34,7 +34,7 @@
 /// In compilation, use "Magick*-config" to get libs and includes right.
 
 
-#include "Image.h"
+#include "drain/image/Image.h"
 
 //#include "Point.h"
 
index 88d5972..0c92cd0 100644 (file)
 
 #include "math.h"
 
-#include "../util/Histogram.h"
+#include "drain/util/Histogram.h"
 
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 
 namespace drain
index 2c34b41..60976dd 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <cmath>
 
-#include "SequentialImageOp.h"
+#include "drain/image/SequentialImageOp.h"
 
 
 namespace drain
index e28cb62..3463b5b 100644 (file)
@@ -22,9 +22,9 @@
 #ifndef PALETTEOP_H_
 #define PALETTEOP_H_
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 #include "CopyOp.h"
-#include "File.h" // ?
+#include "drain/image/File.h" // ?
 
 namespace drain
 {
index 0e226df..9f8830c 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <cmath>
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index 478d1cd..87d7052 100644 (file)
 #ifndef QUADRATIC_SMOOTHEROP
 #define QUADRATIC_SMOOTHEROP "QuadraticSmootherOp Markus.Peura@iki.fi"
 
-#include "WindowOp.h"
+#include "drain/image/WindowOp.h"
 
-#include "FastAverageOp.h"
-#include "MathOpPack.h"
+#include "drain/image/FastAverageOp.h"
+#include "drain/image/MathOpPack.h"
 //#include "SlidingStripeAverageOp.h"
 
 namespace drain
index c6af4ff..96f0a8d 100644 (file)
@@ -23,7 +23,7 @@
 #define QUALITYOVERRIDEOP_H_
 
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index 6ca9e3d..eb14c2f 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef QUANTIZATOROP_H_
 #define QUANTIZATOROP_H_
 
-#include "SequentialImageOp.h"
+#include "drain/image/SequentialImageOp.h"
 
 
 namespace drain
index 29d356a..2a80005 100644 (file)
 #ifndef RECURSIVEREPAIREROP_H_
 #define RECURSIVEREPAIREROP_H_
 
-#include "CopyOp.h"
-#include "FastAverageOp.h"
-#include "QualityOverrideOp.h"
+#include "drain/image/CopyOp.h"
+#include "drain/image/FastAverageOp.h"
+#include "drain/image/QualityOverrideOp.h"
 
 
 // debugging
-#include "File.h"
+#include "drain/image/File.h"
 
 namespace drain
 {
index efbda4c..2a25889 100644 (file)
@@ -25,7 +25,7 @@
 #include <stdexcept>
 
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 
 namespace drain
index 9dedbd4..e5ec189 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef SEGMENTAREAOP_H
 #define SEGMENTAREAOP_H
 
-#include "ImageOp.h"
-#include "FloodFillOp.h"
+#include "drain/image/ImageOp.h"
+#include "drain/image/FloodFillOp.h"
 
 namespace drain
 {
index 0881b1d..d5ef5c5 100644 (file)
@@ -23,7 +23,7 @@
 #define SEQUENTIALIMAGEOP_H_
 
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index 9f82c8e..ce361c7 100644 (file)
@@ -23,7 +23,7 @@
 #define SLIDINGSTRIPEOP_H_
 
 
-#include "SlidingWindowOp.h"
+#include "drain/image/SlidingWindowOp.h"
 //#include "SlidingStripe.h"
 
 namespace drain
index 90b0ea7..eb3d007 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef SLIDINGWINDOW_H_
 #define SLIDINGWINDOW_H_
 
-#include "Window.h"
+#include "drain/image/Window.h"
 
 namespace drain
 {
index f5b7ca8..77808bd 100644 (file)
@@ -24,8 +24,8 @@
 
 
 
-#include "SlidingWindow.h"
-#include "../util/Histogram.h"
+#include "drain/image/SlidingWindow.h"
+#include "drain/util/Histogram.h"
 
 namespace drain
 {
index 8357127..f441dca 100644 (file)
@@ -23,7 +23,7 @@
 #define SLIDINGWINDOWMEDIANOP_H_
 
 
-#include "SlidingWindowHistogram.h"
+#include "drain/image/SlidingWindowHistogram.h"
 
 namespace drain
 {
index b82e5ef..22aeff0 100644 (file)
@@ -22,9 +22,9 @@
 #ifndef SLIDINGWINDOWOP_H_
 #define SLIDINGWINDOWOP_H_
 
-#include "CopyOp.h"
-#include "WindowOp.h"
-#include "SlidingWindow.h"
+#include "drain/image/CopyOp.h"
+#include "drain/image/WindowOp.h"
+#include "drain/image/SlidingWindow.h"
 
 namespace drain
 {
index ef69521..fe936f0 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <cstdarg>
 
-#include "SequentialImageOp.h"
+#include "drain/image/SequentialImageOp.h"
 
 
 namespace drain
index 6961f5f..43c0255 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef WINDOWOP_H_
 #define WINDOWOP_H_
 
-#include "ImageOp.h"
+#include "drain/image/ImageOp.h"
 
 namespace drain
 {
index d36b23b..a8e3bb4 100644 (file)
 
 #include <map>
 
-#include "Geometry.h"
-
-#include "../image/Image.h"
-#include "../image/ImageView.h"
-#include "../image/ImageOp.h"
-#include "../image/File.h"
-
-#include "../image/DistanceTransformOp.h"
-#include "../image/FuzzyPeakOp.h"
-#include "../image/FuzzyThresholdOp.h"
-#include "../image/GammaOp.h"
-#include "../image/HighBoostOp.h"
-#include "../image/MathOpPack.h"
-#include "../image/RunLengthOp.h"
-#include "../image/SegmentAreaOp.h"
-
-#include "../image/Drain.h"
-
-/*
-#include "../image/Image.h"
-#include "../image/CatenatorOp.h"
-#include "../image/CopyOp.h"
-#include "../image/DistanceTransformOp.h"
-#include "../image/DistanceTransformLogOp.h"
-#include "../image/DistanceTransformFillOp.h"
-#include "../image/FloodFillOp.h"
-#include "../image/FuzzyPeakOp.h"
-
-#include "../image/HighPassOp.h"
-#include "../image/MathOpPack.h"
-#include "../image/MarginalStatisticOp.h"
-#include "../image/PaletteOp.h"
-#include "../image/QuantizatorOp.h"
-#include "../image/RecursiveRepairerOp.h"
-#include "../image/RunLengthOp.h"
-#include "../image/SegmentAreaOp.h"
-#include "../image/SlidingStripeOp.h"
-#include "../image/SlidingStripeAverageOp.h"
-#include "../image/SlidingStripeAverageWeightedOp.h"
-#include "../image/SlidingWindowMedianOp.h"
-#include "../image/ThresholdOp.h"
- */
+#include "drain/radar/Geometry.h"
+
+#include "drain/image/Image.h"
+#include "drain/image/ImageView.h"
+#include "drain/image/ImageOp.h"
+#include "drain/image/File.h"
+
+#include "drain/image/DistanceTransformOp.h"
+#include "drain/image/FuzzyPeakOp.h"
+#include "drain/image/FuzzyThresholdOp.h"
+#include "drain/image/GammaOp.h"
+#include "drain/image/HighBoostOp.h"
+#include "drain/image/MathOpPack.h"
+#include "drain/image/RunLengthOp.h"
+#include "drain/image/SegmentAreaOp.h"
+
+#include "drain/image/Drain.h"
+
 namespace drain
 {
 
index 25fbd11..ae43bc6 100644 (file)
@@ -20,7 +20,7 @@
 
 */
 
-#include "Composite.h"
+#include "drain/radar/Composite.h"
 
 
 using namespace std;
index c254273..977449c 100644 (file)
 #ifndef COMPOSITOR_R_H_
 #define COMPOSITOR_R_H_
 
-#include "Coordinates.h" // for site coords and bin coords.
+#include "drain/radar/Coordinates.h" // for site coords and bin coords.
 
-#include "../util/Rectangle.h"
+#include "drain/util/Rectangle.h"
 
-#include "../util/Proj4.h"  // for geographical projection of radar data bins
+#include "drain/util/Proj4.h"  // for geographical projection of radar data bins
 
-#include "../image/Image.h"
-#include "../image/Cumulator.h"
+#include "drain/image/Image.h"
+#include "drain/image/Cumulator.h"
 
 
 using namespace std;
index 5725a51..5f73402 100644 (file)
@@ -20,8 +20,8 @@
 
  */
 #include <math.h>
-#include "../util/Debug.h"
-#include "Coordinates.h"
+#include "drain/util/Debug.h"
+#include "drain/radar/Coordinates.h"
 
 // g++ -I. -c radar__coorz.cpp 
 
index 415d25f..06b9dc9 100644 (file)
@@ -28,7 +28,7 @@
 #include <ostream>
 #include <sstream>
 
-#include "Constants.h"
+#include "drain/radar/Constants.h"
 //#include "radar.h"
 
 
index b777ecb..712a867 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "../radar/Geometry.h"
+#include "drain/radar/Geometry.h"
 
 #include <math.h>
 
index f8ffe62..efd2792 100644 (file)
@@ -23,8 +23,8 @@
 #define POLAR_ATTENUATION_H_
 
 //#include "radar.h"
-#include "../image/Image.h"
-#include "../image/ImageOp.h"
+#include "drain/image/Image.h"
+#include "drain/image/ImageOp.h"
 
 
 namespace drain
index 0ca4099..9716077 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef POLARCAPPI_H_
 #define POLARCAPPI_H_
 
-#include "PolarProduct.h"
+#include "drain/radar/PolarProduct.h"
 
 namespace drain
 {
index a195447..dfd4eef 100644 (file)
@@ -19,8 +19,8 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "../image/Point.h"
-#include "PolarCoordinateHandler.h"
+#include "drain/image/Point.h"
+#include "drain/radar/PolarCoordinateHandler.h"
 
 namespace drain
 {
index b185cc6..2672871 100644 (file)
@@ -22,8 +22,8 @@
 #ifndef POLARCOORDINATEHANDLER_H_
 #define POLARCOORDINATEHANDLER_H_
 
-#include "../image/Point.h"
-#include "../image/CoordinateHandler.h"
+#include "drain/image/Point.h"
+#include "drain/image/CoordinateHandler.h"
 
 namespace drain
 {
index e14e1f1..98340e9 100644 (file)
@@ -23,7 +23,7 @@
 #define POLARECHOTOP_H_
 
 #include <algorithm>
-#include "Geometry.h"
+#include "drain/radar/Geometry.h"
 
 /*
 #include "../image/Image.h"
index 7ebaec7..1b58bc3 100644 (file)
 #ifndef POLARMAXECHO_H_
 #define POLARMAXECHO_H_
 
-#include "Geometry.h"
+#include "drain/radar/Geometry.h"
 
-#include "../image/Image.h"
-#include "../image/ImageView.h"
-#include "../image/ImageOp.h"
+#include "drain/image/Image.h"
+#include "drain/image/ImageView.h"
+#include "drain/image/ImageOp.h"
 
 //#include "geometry.h"
 
index e3ed4a7..44027d0 100644 (file)
 #ifndef POLARPRODUCT_H_
 #define POLARPRODUCT_H_
 
-#include "Geometry.h"
+#include "drain/radar/Geometry.h"
 
-#include "../image/Image.h"
-#include "../image/ImageView.h"
-#include "../image/ImageOp.h"
+#include "drain/image/Image.h"
+#include "drain/image/ImageView.h"
+#include "drain/image/ImageOp.h"
 
 //#include "geometry.h"
 
index c9a0eb9..bad6df1 100644 (file)
@@ -24,9 +24,9 @@
 
 #include <math.h>
 
-#include "../image/Image.h"
-#include "../image/ImageOp.h"
-#include "../image/Cumulator.h"
+#include "drain/image/Image.h"
+#include "drain/image/ImageOp.h"
+#include "drain/image/Cumulator.h"
 
 using namespace drain::image;
 
index 2c4906c..fc717e1 100644 (file)
 #define POLARTOGEOGRAPHICAL_H_
 
 #include <math.h>
-#include "../image/Image.h"
-#include "../image/ImageOp.h"
-#include "../image/Cumulator.h"
+#include "drain/image/Image.h"
+#include "drain/image/ImageOp.h"
+#include "drain/image/Cumulator.h"
 
-#include "../util/ProjectionFrame.h"
+#include "drain/util/ProjectionFrame.h"
 
 using namespace std;
 using namespace drain::image;
index 1c69d04..68295cc 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "ProductXReader.h"
+#include "drain/radar/ProductXReader.h"
 
 namespace drain
 {
index 6565372..3fd45f0 100644 (file)
@@ -24,9 +24,9 @@
 
 #include <stdexcept>
 
-#include "../util/Options.h"
-#include "../image/Image.h"
-#include "../image/Intensity.h"
+#include "drain/util/Options.h"
+#include "drain/image/Image.h"
+#include "drain/image/Intensity.h"
 
 namespace drain
 {
index 59f721a..bc963fa 100644 (file)
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "SubComposite.h"
+#include "drain/radar/SubComposite.h"
 
-#include "../image/DistanceTransformFillOp.h"
-#include "../image/RecursiveRepairerOp.h"
-#include "../image/ThresholdOp.h"
+#include "drain/image/DistanceTransformFillOp.h"
+#include "drain/image/RecursiveRepairerOp.h"
+#include "drain/image/ThresholdOp.h"
 
 namespace drain
 {
index 62fb543..a464623 100644 (file)
 #define SUBCOMPOSITE_H_
 
 
-#include "Composite.h"
+#include "drain/radar/Composite.h"
 //#include "../util/Proj4.h"
 
 
-#include "Coordinates.h"
+#include "drain/radar/Coordinates.h"
 
 namespace drain
 {
index 313eb4e..fb0ba01 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "Data.h"
+#include "drain/util/Data.h"
 
 #include <iostream>
 
index 79e5fb5..658185a 100644 (file)
@@ -26,7 +26,7 @@
  *      Author: mpeura
  */
 
-#include "Debug.h"
+#include "drain/util/Debug.h"
 
 namespace drain {
 
index 0d72bd7..037227a 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <map>
 
-#include "RegExp.h"
+#include "drain/util/RegExp.h"
 
 using namespace std;
 
index be264d0..82124bd 100644 (file)
@@ -21,7 +21,7 @@
 */
 #include <stdexcept>
 
-#include "Options.h"
+#include "drain/util/Options.h"
 
 namespace drain
 {
index 3b40702..3ac466a 100644 (file)
@@ -26,9 +26,9 @@
 #include <string>
 
 //#include "OptionData.h"
-#include "Data.h"
+#include "drain/util/Data.h"
 //#include "MapWrapper.h"
-#include "MapReader.h"
+#include "drain/util/MapReader.h"
 
 using namespace std;   
 
index 9dc78dc..786ff6e 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "Proj4.h"
+#include "drain/util/Proj4.h"
 
 namespace drain
 {
index 38a0a18..42d401e 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "ProjectionFrame.h"
+#include "drain/util/ProjectionFrame.h"
 
 namespace drain
 {
index a341c59..adfbe59 100644 (file)
@@ -23,7 +23,7 @@
 #define PROJECTIONFRAME_H_
 
 #include <math.h>
-#include "Proj4.h"
+#include "drain/util/Proj4.h"
 
 namespace drain
 {
index 0990a03..60224d2 100644 (file)
@@ -27,7 +27,7 @@
 
 // g++ deer_regexp.cpp -o deer_regexp
 
-#include "RegExp.h"
+#include "drain/util/RegExp.h"
 
 using namespace std;
 
index 5afbc6b..2028762 100644 (file)
@@ -19,7 +19,7 @@
     along with Drain.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "String.h"
+#include "drain/util/String.h"
 
 
 #include <stdexcept>
index c70e906..e0da639 100644 (file)
@@ -32,7 +32,7 @@
 #include <string>
 #include <iterator>
 
-#include "RegExp.h"
+#include "drain/util/RegExp.h"
 
 
 using namespace std;
index 25f724f..22ce736 100644 (file)
@@ -27,7 +27,7 @@
 #include <map>
 #include <list>
 #include <iterator>
-#include "RegExp.h"
+#include "drain/util/RegExp.h"
 
 namespace drain {
 
index a728afd..bb8c57d 100644 (file)
@@ -31,9 +31,9 @@
 #include <string>
 #include <map>
 
-#include "String.h"
-#include "RegExp.h"
-#include "Options.h"
+#include "drain/util/String.h"
+#include "drain/util/RegExp.h"
+#include "drain/util/Options.h"
 
 namespace drain {
 
index 6d8aa4a..a9a7f85 100644 (file)
@@ -26,7 +26,7 @@
 
 # Drain specific c flags
 #
-CFLAGS= $(SHARED_FLAG) $(CCOPTS) $(DEFS) -I../rack/rack $(PNG_INCLUDE_DIR) $(PYTHON_INCLUDE_FLAG)\
+CFLAGS= $(SHARED_FLAG) $(CCOPTS) $(DEFS) -I.. $(PNG_INCLUDE_DIR) $(PYTHON_INCLUDE_FLAG)\
                        $(RAVE_INCLUDE_FLAG) $(RAVE_INCLUDE_FLAG)/python $(HLHDF_INCLUDE_FLAG) $(ZLIB_INCDIR) \
                        $(HDF5_INCDIR) $(PROJ_INCLUDE_FLAG)
 
index da976cd..804f65a 100644 (file)
 
 # Rack specific cpp flags
 #
-CPPFLAGS= $(SHARED_FLAG) $(DEFS) -I./hi5 -I./rack -I./ropo $(PNG_INCLUDE_DIR) \
+CPPFLAGS= $(SHARED_FLAG) $(DEFS) -I.. $(PNG_INCLUDE_DIR) \
                        $(RAVE_INCLUDE_FLAG) $(HLHDF_INCLUDE_FLAG) $(ZLIB_INCDIR) \
                        $(HDF5_INCDIR) $(PROJ_INCLUDE_FLAG)
 
 # Rack specific c flags
 #
-CFLAGS= $(SHARED_FLAG) $(CCOPTS) $(DEFS) -I./hi5 -I./rack -I./ropo $(PNG_INCLUDE_DIR) \
+CFLAGS= $(SHARED_FLAG) $(CCOPTS) $(DEFS) -I.. $(PNG_INCLUDE_DIR) \
                        $(RAVE_INCLUDE_FLAG) $(HLHDF_INCLUDE_FLAG) $(ZLIB_INCDIR) \
                        $(HDF5_INCDIR) $(PROJ_INCLUDE_FLAG)
 
index f857081..93a1150 100644 (file)
@@ -20,7 +20,7 @@
 
 */
 
-#include "RaveConvert.h"
+#include "rack/hi5/RaveConvert.h"
 
 #include <iostream>
 #include <map>
@@ -32,7 +32,7 @@ using namespace drain::image;
 #include <drain/image/CatenatorOp.h>
 #include <drain/util/Debug.h>
 
-#include "DataScaleOp.h"
+#include "rack/hi5/DataScaleOp.h"
 
 extern "C"
 {
index f546239..44cbf41 100644 (file)
 
    Created on: Apr 13, 2011
 */
-#include "Rack.h"
-#include "RackIf.h"
-#include "RackLocalIf.h"
-#include "../hi5/RaveConvert.h"
+#include "rack/rack/Rack.h"
+#include "rack/rack/RackIf.h"
+#include "rack/rack/RackLocalIf.h"
+#include "rack/hi5/RaveConvert.h"
 
 extern "C"
 {
index bf2c4f7..a27fba7 100644 (file)
@@ -23,7 +23,7 @@
 
 
 #include <drain/image/CopyOp.h>
-#include "Ropo.h"
+#include "rack/ropo/Ropo.h"
 
 namespace drain {
 
index a8497a5..9dcab5f 100644 (file)
@@ -26,9 +26,9 @@
 extern "C" {
 
 #include "stdio.h"
-#include "fmi_image.h"
-#include "fmi_image_filter_speck.h"
-#include "fmi_radar_image.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter_speck.h"
+#include "rack/ropo/fmi_radar_image.h"
 
 /*     void testRopo(const char *str); */
 
index 630cd9d..fce49e1 100644 (file)
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <vector>
 #include <iterator>
-#include "convertImage.h"
+#include "rack/ropo/convertImage.h"
 #include <drain/util/Debug.h>
 
 void convertImage(const FmiImage &src,drain::image::Image<Byte> &dst){
index 67f3bdc..c5a003d 100644 (file)
@@ -28,7 +28,7 @@
 #define __CONVERT_IMAGE__
 
 extern "C" {
-       #include "fmi_image.h"
+       #include "rack/ropo/fmi_image.h"
 }
 
 #include <drain/image/Image.h>
index dc9fd54..c91ac73 100644 (file)
@@ -24,8 +24,8 @@
 #include <math.h>
 #include <malloc.h>
 #include <stdlib.h>
-#include "fmi_image.h"
-#include "fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_util.h"
 
 
 /*img->array=NULL;*/
index d6e4d58..37f2046 100644 (file)
@@ -19,7 +19,7 @@
     You should have received a copy of the GNU Lesser Public License
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include "fmi_image.h"
+#include "rack/ropo/fmi_image.h"
 
 void image_average_horz(FmiImage *source,FmiImage *vert){
   register int i,j;
index 74deb17..6fcf561 100644 (file)
@@ -20,9 +20,9 @@
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <math.h> 
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_filter.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter.h"
 
 void detect_vert_gradient(FmiImage *source,FmiImage *trace){
   int i,j,k;
index 36aa7ed..8bbb837 100644 (file)
     You should have received a copy of the GNU Lesser Public License
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_filter_line.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_filter_line.h"
 
 /* source = VALUE TO BE PROPAGATED; IF NULL VALUE=1*/
 /* mask = control image */
index 7afa24e..9d17e66 100644 (file)
     You should have received a copy of the GNU Lesser Public License
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_histogram.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_histogram.h"
 
 void morph_closing(FmiImage *source,FmiImage *target,int w,int h){
   FmiImage temp;
index 4423de3..af65d1c 100644 (file)
 
 #include <stdio.h>
 /*#include <limits.h> */
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_histogram.h"
-#include "fmi_image_filter_speck.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_histogram.h"
+#include "rack/ropo/fmi_image_filter_speck.h"
 
 /* THIS IS THE GOOD OLD BINARY PROBE */
 
index f3ba587..d896ef5 100644 (file)
     You should have received a copy of the GNU Lesser Public License
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_filter_texture.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_filter_texture.h"
 
 void detect_texture(FmiImage *source,FmiImage *trace){
   canonize_image(source,trace);
index ee3fed4..faac666 100644 (file)
 #include <stdio.h>
 /*#include <limits.h> */
 #include <math.h> /* sqrt() */
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_histogram.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_histogram.h"
 
 /*FmiImage *histogram_weight_image=NULL; */
 /*histogram_weight_image=NULL; */
index ebb89b6..8ea27ae 100644 (file)
@@ -19,9 +19,9 @@
     You should have received a copy of the GNU Lesser Public License
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include "fmi_image_restore.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_histogram.h"
+#include "rack/ropo/fmi_image_restore.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_histogram.h"
 
 
 void mark_image(FmiImage *target,FmiImage *prob,Byte threshold,Byte marker){ 
index 79f9fa8..332dcc7 100644 (file)
@@ -24,7 +24,7 @@
 #ifndef __FMI_IMAGE_RESTORE__
 #define __FMI_IMAGE_RESTORE__
 
-#include "fmi_image.h"
+#include "rack/ropo/fmi_image.h"
 
 
 void mark_image(FmiImage *target,FmiImage *prob,Byte threshold,Byte marker);
index 21ef3b5..b24a7d2 100644 (file)
@@ -19,7 +19,7 @@
     You should have received a copy of the GNU Lesser Public License
     along with Rack.  If not, see <http://www.gnu.org/licenses/>. */
 
-#include "fmi_image.h"
+#include "rack/ropo/fmi_image.h"
 
 Byte celsius_to_meteosatbyte(Celsius c){
   int ans;
index 8d7452f..a941f11 100644 (file)
@@ -21,7 +21,7 @@
 
 
 
-#include "fmi_image.h"
+#include "rack/ropo/fmi_image.h"
 
 Byte celsius_to_meteosatbyte(Celsius c);
 
index b948ec6..70a2201 100644 (file)
 #include <math.h>
 #include <limits.h>
 #include <malloc.h>
-#include "fmi_util.h"
-#include "fmi_image.h"
-#include "fmi_image_arith.h"
-#include "fmi_image_filter.h"
-#include "fmi_image_filter_morpho.h"
-#include "fmi_image_filter_line.h"
-#include "fmi_image_histogram.h"
-#include "fmi_image_filter_speck.h"
-#include "fmi_meteosat.h"
-#include "fmi_radar_image.h"
+#include "rack/ropo/fmi_util.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_image_arith.h"
+#include "rack/ropo/fmi_image_filter.h"
+#include "rack/ropo/fmi_image_filter_morpho.h"
+#include "rack/ropo/fmi_image_filter_line.h"
+#include "rack/ropo/fmi_image_histogram.h"
+#include "rack/ropo/fmi_image_filter_speck.h"
+#include "rack/ropo/fmi_meteosat.h"
+#include "rack/ropo/fmi_radar_image.h"
 
 
 float fmi_radar_sweep_angles[FMI_RADAR_SWEEP_COUNT]={0.5, 1.5, 2.5, 3.5, 4.5, 6.0, 8.0, 11.0, 20.0, 45.0};
index 6e78806..f06ea3a 100644 (file)
@@ -28,8 +28,8 @@
 
 typedef signed char Dbz;
 
-#include "fmi_image.h"
-#include "fmi_radar_codes.h"
+#include "rack/ropo/fmi_image.h"
+#include "rack/ropo/fmi_radar_codes.h"
 
 
 #define FMI_RADAR_SWEEP_COUNT 20  /* ACTUALLY: MAXIMUM  2009 */
index 31e0a77..cd5033b 100644 (file)
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
-#include "fmi_util.h"
+#include "rack/ropo/fmi_util.h"
 
 char *fmi_util_comment=NULL;
 
index 0824c32..543276b 100644 (file)
@@ -4,10 +4,10 @@
 #include <rave_io.h>
 #include <polarvolume.h>
 #include <polarscan.h>
-#include <fmi_image.h>
-#include <fmi_radar_image.h>
+#include <rack/ropo/fmi_image.h>
+#include <rack/ropo/fmi_radar_image.h>
 
-#include "ropo_hdf.h"
+#include "rack/ropo/ropo_hdf.h"
 
 int
 is_hdf_file(char *filename)