/[public]/psiconv/trunk/configure.in
ViewVC logotype

Diff of /psiconv/trunk/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 52 Revision 53
64AC_ARG_WITH(imagemagick, 64AC_ARG_WITH(imagemagick,
65 [ --with-imagemagick enable ImageMagick (default = yes)], 65 [ --with-imagemagick enable ImageMagick (default = yes)],
66 [IMAGEMAGICK=$withval], 66 [IMAGEMAGICK=$withval],
67 [IMAGEMAGICK='yes']) 67 [IMAGEMAGICK='yes'])
68if test x"$IMAGEMAGICK" != xno ; then 68if test x"$IMAGEMAGICK" != xno ; then
69 AC_CHECK_LIB(Magick,ConstituteImage,IMAGEMAGICK=yes,IMAGEMAGICK=no) 69 AC_CHECK_PROG(IMAGEMAGICK,Magick-config,yes,no)
70 if test x"$IMAGEMAGICK" != xno ; then 70 if test x"$IMAGEMAGICK" != xno ; then
71 CFLAGS_OLD="$CFLAGS"
72 CPPFLAGS_OLD="$CPPFLAGS"
73 LDFLAGS_OLD="$LDFLAGS"
71 LIBS_SAVE="$LIBS" 74 LIBS_OLD="$LIBS"
72 LIBS="$LIBS -lMagick" 75 CFLAGS="$CFLAGS `Magick-config --cflags`"
76 CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
77 LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
78 LIBS="$LIBS `Magick-config --libs`"
79
73 AC_MSG_CHECKING(whether GetMagickInfo works) 80 AC_MSG_CHECKING(whether GetMagickInfo works)
74 AC_TRY_RUN([ #include <magick/magick.h> 81 AC_TRY_RUN([ #include <magick/magick.h>
82 #include <magick/config.h>
75 #include <stdio.h> 83 #include <stdio.h>
84 extern void OpenModules(void);
76 int main(void) { MagickInfo *mi;GetMagickInfo(NULL); 85 int main(void) { GetMagickInfo(NULL);
77 #if defined(HasLTDL) 86 #if defined(HasLTDL)
78 OpenModules(); 87 OpenModules();
79 #endif 88 #endif
80 return (NULL != GetMagickInfo(NULL)); }], 89 return (NULL == GetMagickInfo(NULL)); }],
81 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes) 90 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes)
82 AC_MSG_RESULT($IMAGEMAGICK) 91 AC_MSG_RESULT($IMAGEMAGICK)
92 LDFLAGS="$LDFLAGS_OLD"
83 LIBS="$LIBS_SAVE" 93 LIBS="$LIBS_OLD"
94dnl Note: CFLAGS can't be set for single directories, so we propagate them
95 if test x"$IMAGEMAGICK" = xno ; then
96 CFLAGS="$CFLAGS_OLD"
97 CPPFLAGS="$CPPFLAGS_OLD"
98 fi
84 fi 99 fi
85 if test x"$IMAGEMAGICK" = xno ; then
86 AC_MSG_WARN(ImageMagick support disabled!)
87 fi
88fi 100fi
89if test x"$IMAGEMAGICK" = xyes ; then 101if test x"$IMAGEMAGICK" = xyes ; then
90 LIB_MAGICK=-lMagick 102 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
91 AC_DEFINE(IMAGEMAGICK) 103 AC_DEFINE(IMAGEMAGICK)
92else 104else
93 LIB_MAGICK= 105 LIB_MAGICK=
94fi 106fi
95AC_SUBST(LIB_MAGICK) 107AC_SUBST(LIB_MAGICK)

Legend:
Removed from v.52  
changed lines
  Added in v.53

frodo@frodo.looijaard.name
ViewVC Help
Powered by ViewVC 1.1.26