/[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 151 Revision 152
76 CFLAGS="$CFLAGS `Magick-config --cflags`" 76 CFLAGS="$CFLAGS `Magick-config --cflags`"
77 CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`" 77 CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
78 LDFLAGS="$LDFLAGS `Magick-config --ldflags`" 78 LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
79 LIBS="$LIBS `Magick-config --libs`" 79 LIBS="$LIBS `Magick-config --libs`"
80 80
81
81 AC_MSG_CHECKING(whether GetMagickInfo works) 82 AC_MSG_CHECKING(whether GetMagickInfo works and which API to use)
82 AC_TRY_RUN([ #include <magick/magick.h> 83 AC_TRY_RUN([ #include <stdio.h>
84 #include <magick/api.h>
83 int main(void) { ExceptionInfo exception; 85 int main(void) { ExceptionInfo exception;
84 GetExceptionInfo(&exception); 86 GetExceptionInfo(&exception);
85 OpenModules(&exception); 87 OpenModules(&exception);
86 return (NULL == GetMagickInfo(NULL,&exception)); }], 88 return (NULL == GetMagickInfo(NULL,&exception)); }],
87 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes) 89 IMAGEMAGICK=new,IMAGEMAGICK=no,IMAGEMAGICK=no)
90 if test x"$IMAGEMAGICK" = xno ; then
91 AC_TRY_RUN([ #include <magick/magick.h>
92 int main(void) { ExceptionInfo exception;
93 GetExceptionInfo(&exception);
94 OpenModules(&exception);
95 return (NULL == GetMagickInfo(NULL,&exception)); }],
96 IMAGEMAGICK=old,IMAGEMAGICK=no,IMAGEMAGICK=no)
97 fi
88 AC_MSG_RESULT($IMAGEMAGICK) 98 AC_MSG_RESULT($IMAGEMAGICK)
89 LDFLAGS="$LDFLAGS_OLD" 99 LDFLAGS="$LDFLAGS_OLD"
90 LIBS="$LIBS_OLD" 100 LIBS="$LIBS_OLD"
91dnl Note: CFLAGS can't be set for single directories, so we propagate them 101dnl Note: CFLAGS can't be set for single directories, so we propagate them
92 if test x"$IMAGEMAGICK" = xno ; then 102 if test x"$IMAGEMAGICK" = xno ; then
93 CFLAGS="$CFLAGS_OLD" 103 CFLAGS="$CFLAGS_OLD"
94 CPPFLAGS="$CPPFLAGS_OLD" 104 CPPFLAGS="$CPPFLAGS_OLD"
95 fi 105 fi
96 fi 106 fi
97fi 107fi
98if test x"$IMAGEMAGICK" = xyes ; then 108if test x"$IMAGEMAGICK" != xno ; then
99 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`" 109 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
100 AC_DEFINE(IMAGEMAGICK,1,[ImageMagick availability]) 110 AC_DEFINE(IMAGEMAGICK,1,[ImageMagick availability])
111 if test x"$IMAGEMAGICK" = xold ; then
112 AC_DEFINE(IMAGEMAGICK_OLD,1,[ImageMagick old API version])
113 fi
101else 114else
102 LIB_MAGICK= 115 LIB_MAGICK=
103fi 116fi
104AC_SUBST(LIB_MAGICK) 117AC_SUBST(LIB_MAGICK)
105 118
125 AC_MSG_RESULT(char) 138 AC_MSG_RESULT(char)
126elif test $ac_cv_sizeof_short -ge 1 ; then 139elif test $ac_cv_sizeof_short -ge 1 ; then
127 INT_8_BIT=short 140 INT_8_BIT=short
128 AC_MSG_RESULT(short) 141 AC_MSG_RESULT(short)
129elif test $ac_cv_sizeof_int -ge 1 ; then 142elif test $ac_cv_sizeof_int -ge 1 ; then
130 INT_8_BIT=int
131 AC_MSG_RESULT(int) 143 AC_MSG_RESULT(int)
132elif test $ac_cv_sizeof_long -ge 1 ; then 144elif test $ac_cv_sizeof_long -ge 1 ; then
133 INT_8_BIT=long 145 INT_8_BIT=long
134 AC_MSG_RESULT(long) 146 AC_MSG_RESULT(long)
135else 147else

Legend:
Removed from v.151  
changed lines
  Added in v.152

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