Attachment #147952 for bug #215671




        fi
    fi

		AC_MSG_CHECKING(Wand-config --cppflags)
		WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
		AC_MSG_RESULT($WAND_CPPFLAGS)
		ORIG_CFLAGS="$CPPFLAGS"
		CPPFLAGS="$ORIG_CPPFLAGS $WAND_CPPFLAGS"
		dnl AC_MSG_CHECKING(for magick-wand.h header file)
		AC_CHECK_HEADER(wand/magick-wand.h, PHP_EVAL_INCLINE($WAND_CPPFLAGS),
			AC_MSG_ERROR(Cannot locate header file magick-wand.h))
		CPPFLAGS="$ORIG_CPPFLAGS"


		IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`


		PHP_ADD_LIBRARY_WITH_PATH(Magick, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
		PHP_ADD_LIBRARY_WITH_PATH(Wand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
		PHP_ADD_INCLUDE($WAND_DIR/include)
		PHP_SUBST(MAGICKWAND_SHARED_LIBADD)
		PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared)





dnl execute code, if variable is not set in namespace
dnl
AC_DEFUN([PHP_RUN_ONCE],[
  unique=`echo $2|$SED 's/@<:@^a-zA-Z0-9@:>@/_/g'`
  unique=`echo $2|$SED 's/[^a-zA-Z0-9]/_/g'`
  changequote([,])
  cmd="echo $ac_n \"\$$1$unique$ac_c\""
  if test -n "$unique" && test "`eval $cmd`" = "" ; then
    eval "$1$unique=set"

  if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then
    $2=$1
  else
    ep_dir="`echo $1|$SED 's%/*@<:@^/@:>@@<:@^/@:>@*/*$%%'`"
    ep_dir="`echo $1|$SED 's%/*[^/][^/]*/*$%%'`"
    changequote([,])
    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
    $2="$ep_realdir/`basename \"$1\"`"
  fi

dnl Stores the location of libgcc in libgcc_libpath
dnl
AC_DEFUN([PHP_LIBGCC_LIBPATH],[
  libgcc_libpath=`$1 --print-libgcc-file-name|$SED 's%/*@<:@^/@:>@@<:@^/|:>@*$%%'`
  libgcc_libpath=`$1 --print-libgcc-file-name|$SED 's%/*[^/][^/]*$%%'`
  changequote([,])
])

dnl -------------------------------------------------------------------------

Return to bug 215671

Lines 26-39 Link Here

(-)MagickWandForPHP-1.0.6.orig/config.m4 (-9 / +9 lines)
26	fi	26	fi
27	fi	27	fi
28		28
29	WAND_DIR=`$WAND_CONFIG_PATH/Wand-config --prefix`	29	AC_MSG_CHECKING(Wand-config --cppflags)
30	AC_MSG_CHECKING(for magick-wand.h header file)	30	WAND_CPPFLAGS="`$WAND_CONFIG_PATH/Wand-config --cppflags`"
31		31	AC_MSG_RESULT($WAND_CPPFLAGS)
32	if test -r $WAND_DIR/include/wand/magick-wand.h; then	32	ORIG_CFLAGS="$CPPFLAGS"
33	AC_MSG_RESULT(found in $WAND_DIR/include/wand/magick-wand.h)	33	CPPFLAGS="$ORIG_CPPFLAGS $WAND_CPPFLAGS"
34	else	34	dnl AC_MSG_CHECKING(for magick-wand.h header file)
35	AC_MSG_ERROR(Cannot locate header file magick-wand.h)	35	AC_CHECK_HEADER(wand/magick-wand.h, PHP_EVAL_INCLINE($WAND_CPPFLAGS),
36	fi	36	AC_MSG_ERROR(Cannot locate header file magick-wand.h))
		37	CPPFLAGS="$ORIG_CPPFLAGS"
37		38
38		39
39	IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`	40	IMAGEMAGICK_VERSION_ORIG=`$WAND_CONFIG_PATH/Wand-config --version`
Lines 75-81 Link Here
75		76
76	PHP_ADD_LIBRARY_WITH_PATH(Magick, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)	77	PHP_ADD_LIBRARY_WITH_PATH(Magick, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
77	PHP_ADD_LIBRARY_WITH_PATH(Wand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)	78	PHP_ADD_LIBRARY_WITH_PATH(Wand, $WAND_DIR/lib, MAGICKWAND_SHARED_LIBADD)
78	PHP_ADD_INCLUDE($WAND_DIR/include)
79	PHP_SUBST(MAGICKWAND_SHARED_LIBADD)	79	PHP_SUBST(MAGICKWAND_SHARED_LIBADD)
80	PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared)	80	PHP_NEW_EXTENSION(magickwand, magickwand.c, $ext_shared)
81		81

Lines 46-54 Link Here

(-)MagickWandForPHP-1.0.6.orig/aclocal.m4 (-9 / +3 lines)
46	dnl execute code, if variable is not set in namespace	46	dnl execute code, if variable is not set in namespace
47	dnl	47	dnl
48	AC_DEFUN([PHP_RUN_ONCE],[	48	AC_DEFUN([PHP_RUN_ONCE],[
49	changequote({,})	49	unique=`echo $2\|$SED 's/@<:@^a-zA-Z0-9@:>@/_/g'`
50	unique=`echo $2\|$SED 's/[^a-zA-Z0-9]/_/g'`
51	changequote([,])
52	cmd="echo $ac_n \"\$$1$unique$ac_c\""	50	cmd="echo $ac_n \"\$$1$unique$ac_c\""
53	if test -n "$unique" && test "`eval $cmd`" = "" ; then	51	if test -n "$unique" && test "`eval $cmd`" = "" ; then
54	eval "$1$unique=set"	52	eval "$1$unique=set"
Lines 65-73 Link Here
65	if test -z "$1" \|\| echo "$1" \| grep '^/' >/dev/null ; then	63	if test -z "$1" \|\| echo "$1" \| grep '^/' >/dev/null ; then
66	$2=$1	64	$2=$1
67	else	65	else
68	changequote({,})	66	ep_dir="`echo $1\|$SED 's%/@<:@^/@:>@@<:@^/@:>@/*$%%'`"
69	ep_dir="`echo $1\|$SED 's%/[^/][^/]/*$%%'`"
70	changequote([,])
71	ep_realdir="`(cd \"$ep_dir\" && pwd)`"	67	ep_realdir="`(cd \"$ep_dir\" && pwd)`"
72	$2="$ep_realdir/`basename \"$1\"`"	68	$2="$ep_realdir/`basename \"$1\"`"
73	fi	69	fi
Lines 358-366 Link Here
358	dnl Stores the location of libgcc in libgcc_libpath	354	dnl Stores the location of libgcc in libgcc_libpath
359	dnl	355	dnl
360	AC_DEFUN([PHP_LIBGCC_LIBPATH],[	356	AC_DEFUN([PHP_LIBGCC_LIBPATH],[
361	changequote({,})	357	libgcc_libpath=`$1 --print-libgcc-file-name\|$SED 's%/@<:@^/@:>@@<:@^/\|:>@$%%'`
362	libgcc_libpath=`$1 --print-libgcc-file-name\|$SED 's%/[^/][^/]$%%'`
363	changequote([,])
364	])	358	])
365		359
366	dnl -------------------------------------------------------------------------	360	dnl -------------------------------------------------------------------------