wavelet-commit

[Herbert M. D. <he...@us...>]

Update of /cvsroot/wavelet/Wavelet
In directory vz-cvs-4.sog:/tmp/cvs-serv9825

Modified Files:
	avilib.h configure configure.in 
Log Message:
MacOS Compat, better ImageMagick detection

Index: configure.in
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** configure.in	19 Oct 2009 12:37:01 -0000	1.7
--- configure.in	11 Mar 2011 11:14:18 -0000	1.8
***************
*** 125,132 ****
  AC_LANG_PUSH(C++)
  CPPFLAGS_ORG=$CPPFLAGS
! CPPFLAGS="-I/usr/include/GraphicsMagick $CPPFLAGS"
  export CPPFLAGS
  AC_CHECK_HEADER(GraphicsMagick/Magick++.h,
!     MAGICK_INTER_DEF="-I/usr/include/GraphicsMagick -DMAGICK_INTER"
      MAGICK_INTER_LIB="-lGraphicsMagick++",
      MAGICK_INTER_DEF=""
--- 125,132 ----
  AC_LANG_PUSH(C++)
  CPPFLAGS_ORG=$CPPFLAGS
! CPPFLAGS="-I/usr/local/include/GraphicsMagick -I/usr/include/GraphicsMagick $CPPFLAGS"
  export CPPFLAGS
  AC_CHECK_HEADER(GraphicsMagick/Magick++.h,
!     MAGICK_INTER_DEF="-I/usr/local/include/GraphicsMagick -I/usr/include/GraphicsMagick -DMAGICK_INTER"
      MAGICK_INTER_LIB="-lGraphicsMagick++",
      MAGICK_INTER_DEF=""
***************
*** 136,145 ****
  unset CPPFLAGS
  if test -z "$MAGICK_INTER_DEF"; then
  AC_CHECK_HEADER(Magick++.h,
!     MAGICK_INTER_DEF="-DMAGICK_INTER"
      MAGICK_INTER_LIB="-lMagick++",
      MAGICK_INTER_DEF=""
      MAGICK_INTER_LIB=""
  )
  fi
  AC_LANG_POP
--- 136,149 ----
  unset CPPFLAGS
  if test -z "$MAGICK_INTER_DEF"; then
+ CPPFLAGS="-I/usr/local/include/ImageMagick -I/usr/include/ImageMagick $CPPFLAGS"
+ export CPPFLAGS
  AC_CHECK_HEADER(Magick++.h,
!     MAGICK_INTER_DEF="-I/usr/local/include/ImageMagick -I/usr/include/ImageMagick -DMAGICK_INTER"
      MAGICK_INTER_LIB="-lMagick++",
      MAGICK_INTER_DEF=""
      MAGICK_INTER_LIB=""
  )
+ CPPFLAGS=$CPPFLAGS_ORG
+ unset CPPFLAGS
  fi
  AC_LANG_POP

Index: configure
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/configure,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure	16 Oct 2009 11:08:48 -0000	1.6
--- configure	11 Mar 2011 11:14:18 -0000	1.7
***************
*** 1,80 ****
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
! # Generated by GNU Autoconf 2.64.
  #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
! # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
! # Foundation, Inc.
! #
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
[...9006 lines suppressed...]
  
  
  # configure is writing to config.log, and then calls config.status.
***************
*** 5892,5900 ****
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
!   $ac_cs_success || as_fn_exit $?
! fi
! if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
!   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
--- 6468,6472 ----
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
!   $ac_cs_success || { (exit 1); exit 1; }
  fi
  

Index: avilib.h
===================================================================
RCS file: /cvsroot/wavelet/Wavelet/avilib.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** avilib.h	19 May 2010 11:42:36 -0000	1.9
--- avilib.h	11 Mar 2011 11:14:18 -0000	1.10
***************
*** 105,109 ****
  #endif
  
! #ifdef SYS_LINUX
  #include <stdint.h>
  #endif
--- 105,109 ----
  #endif
  
! #if defined(SYS_LINUX) || defined(SYS_APPLE)
  #include <stdint.h>
  #endif