[dx: 14/14] Merge remote branch 'origin/el6/master'

[Dominik Mierzejewski]

commit 8b60c8111019e852a224b02251226474d4d1c44a
Merge: fc2b249 5e5e661
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Sat Dec 11 03:22:56 2010 +0100

    Merge remote branch 'origin/el6/master'
    
    Conflicts:
    	dx-rpm.patch
    	dx.spec

 dx-rpm.patch |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
---
diff --cc dx-rpm.patch
index 7645bcf,202db77..6ecf1d5
--- a/dx-rpm.patch
+++ b/dx-rpm.patch
@@@ -170,25 -170,14 +170,45 @@@ diff -up dx-4.4.4/configure.ac.r dx-4.4
   	LIBS="$LIB_HDF $LIBS"
   	FMT_LIBS="$FMT_LIBS libdf.a"
   	AC_DEFINE(HAVE_LIBDF, 1, [Define to 1 if you have the HDF libraries])
 -@@ -766,7 +767,7 @@ then
 -     AS_MESSAGE([checking for NETCDF support ......])
 +@@ -801,6 +802,9 @@ then
 + 
       failed=0;
       passed=0;
 --    AC_CHECK_HEADER(netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
 -+    AC_CHECK_HEADER(netcdf/netcdf.h,passed=`expr $passed + 1`,failed=`expr $failed + 1`)
 -     AC_CHECK_LIB(netcdf,nc_copy_att,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
 -     AC_MSG_CHECKING(if NETCDF package is complete)
 ++    CFLAGS="$CFLAGS -I/usr/include/ImageMagick"
 ++    CXXFLAGS="$CXXFLAGS -I/usr/include/ImageMagick"
 ++    CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick"
 +     AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
 + if test "$ARCH" = "intelnt" ; then
 +     AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
 +@@ -835,8 +839,8 @@ dnl routine. This allows us to simplify 
 + dnl format configuration libraries.
 + 
 +  if test "$HAVE_MC" = "yes" ; then
 +-    LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
++-    AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
+++    LIB_MAGICK="`MagickCore-config --ldflags` `MagickCore-config --libs`"
+++    AC_CHECK_LIB(MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
++     AC_MSG_CHECKING(if ImageMagick package is complete)
++     if test $passed -gt 0
++@@ -801,6 +802,9 @@ then
++ 
++     failed=0;
++     passed=0;
+++    CFLAGS="$CFLAGS -I/usr/include/ImageMagick"
+++    CXXFLAGS="$CXXFLAGS -I/usr/include/ImageMagick"
+++    CPPFLAGS="$CPPFLAGS -I/usr/include/ImageMagick"
++     AC_CHECK_HEADER([magick/api.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
++ if test "$ARCH" = "intelnt" ; then
++     AC_CHECK_LIB(CORE_RL_magick_,Hopen,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
++@@ -835,8 +839,8 @@ dnl routine. This allows us to simplify 
++ dnl format configuration libraries.
++ 
++  if test "$HAVE_MC" = "yes" ; then
++-    LIB_MAGICK="`Magick-config --ldflags` `Magick-config --libs`"
 +-    AC_CHECK_LIB( Magick,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
 ++    LIB_MAGICK="`MagickCore-config --ldflags` `MagickCore-config --libs`"
 ++    AC_CHECK_LIB(MagickCore,GetImageInfo, passed=`expr $passed + 1`, failed=`expr $failed + 1`, [ $LIB_MAGICK ])
 +     AC_MSG_CHECKING(if ImageMagick package is complete)
       if test $passed -gt 0
  @@ -801,6 +802,9 @@ then