/[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 253 Revision 255
… …
79 LIBS="$LIBS `Magick-config --libs`" 79 LIBS="$LIBS `Magick-config --libs`"
80 80
81 81
82 AC_MSG_CHECKING(whether GetMagickInfo works and which API to use) 82 AC_MSG_CHECKING(whether GetMagickInfo works and which API to use)
83 AC_TRY_RUN([ #include <stdio.h> 83 AC_TRY_RUN([ #include <stdio.h>
84 #include <stdlib.h>
84 #include <time.h> 85 #include <time.h>
85 #include <magick/api.h> 86 #include <magick/api.h>
87 int main(void) {
88 unsigned long number_formats;
89 ExceptionInfo exception;
90 GetExceptionInfo(&exception);
91 OpenModules(&exception);
92 GetMagickInfoList("*",&number_formats,&exception);
93 return number_formats == 0; }],
94 IMAGEMAGICK=4,IMAGEMAGICK=no,IMAGEMAGICK=no)
95 if test x"$IMAGEMAGICK" = xno ; then
96 AC_TRY_RUN([ #include <stdio.h>
97 #include <stdlib.h>
98 #include <time.h>
99 #include <magick/api.h>
100 int main(void) {
101 unsigned long number_formats;
102 ExceptionInfo exception;
103 GetExceptionInfo(&exception);
104 OpenModules(&exception);
105 GetMagickInfoList("*",&number_formats);
106 return number_formats == 0; }],
107 IMAGEMAGICK=3,IMAGEMAGICK=no,IMAGEMAGICK=no)
108 fi
109 if test x"$IMAGEMAGICK" = xno ; then
110 AC_TRY_RUN([ #include <stdio.h>
111 #include <stdlib.h>
112 #include <time.h>
113 #include <magick/api.h>
86 int main(void) { ExceptionInfo exception; 114 int main(void) { ExceptionInfo exception;
87 GetExceptionInfo(&exception); 115 GetExceptionInfo(&exception);
88 OpenModules(&exception); 116 OpenModules(&exception);
89 return (NULL == GetMagickInfo(NULL,&exception)); }], 117 return (NULL == GetMagickInfo(NULL,&exception)); }],
90 IMAGEMAGICK=new,IMAGEMAGICK=no,IMAGEMAGICK=no) 118 IMAGEMAGICK=2,IMAGEMAGICK=no,IMAGEMAGICK=no)
119 fi
91 if test x"$IMAGEMAGICK" = xno ; then 120 if test x"$IMAGEMAGICK" = xno ; then
92 AC_TRY_RUN([ #include <magick/magick.h> 121 AC_TRY_RUN([ #include <magick/magick.h>
93 int main(void) { ExceptionInfo exception; 122 int main(void) { ExceptionInfo exception;
94 GetExceptionInfo(&exception); 123 GetExceptionInfo(&exception);
95 OpenModules(&exception); 124 OpenModules(&exception);
96 return (NULL == GetMagickInfo(NULL,&exception)); }], 125 return (NULL == GetMagickInfo(NULL,&exception)); }],
97 IMAGEMAGICK=old,IMAGEMAGICK=no,IMAGEMAGICK=no) 126 IMAGEMAGICK=1,IMAGEMAGICK=no,IMAGEMAGICK=no)
98 fi 127 fi
99 AC_MSG_RESULT($IMAGEMAGICK) 128 AC_MSG_RESULT("Version $IMAGEMAGICK")
100 LDFLAGS="$LDFLAGS_OLD" 129 LDFLAGS="$LDFLAGS_OLD"
101 LIBS="$LIBS_OLD" 130 LIBS="$LIBS_OLD"
102dnl Note: CFLAGS can't be set for single directories, so we propagate them 131dnl Note: CFLAGS can't be set for single directories, so we propagate them
103 if test x"$IMAGEMAGICK" = xno ; then 132 if test x"$IMAGEMAGICK" = xno ; then
104 CFLAGS="$CFLAGS_OLD" 133 CFLAGS="$CFLAGS_OLD"
… …
106 fi 135 fi
107 fi 136 fi
108fi 137fi
109if test x"$IMAGEMAGICK" != xno ; then 138if test x"$IMAGEMAGICK" != xno ; then
110 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`" 139 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
111 AC_DEFINE(IMAGEMAGICK,1,[ImageMagick availability]) 140 AC_DEFINE(IMAGEMAGICK, 1 ,[ImageMagick availability])
112 if test x"$IMAGEMAGICK" = xold ; then 141 AC_DEFINE_UNQUOTED(IMAGEMAGICK_API, $IMAGEMAGICK, [ImageMagick API version])
113 AC_DEFINE(IMAGEMAGICK_OLD,1,[ImageMagick old API version])
114 fi
115else 142else
116 LIB_MAGICK= 143 LIB_MAGICK=
117fi 144fi
118AC_SUBST(LIB_MAGICK) 145AC_SUBST(LIB_MAGICK)
119 146
Legend:
Removed from v.253  
changed lines
  Added in v.255
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26