/[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 118
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2AC_INIT(psiconv) 2AC_INIT
3AC_CONFIG_SRCDIR([lib/psiconv])
3AM_INIT_AUTOMAKE(psiconv,0.6.1) 4AM_INIT_AUTOMAKE(psiconv,0.8.1)
4 5
5AM_CONFIG_HEADER(config.h) 6AM_CONFIG_HEADER(config.h)
6 7
7dnl Checks for programs. 8dnl Checks for programs.
8AM_PROG_LIBTOOL 9AM_PROG_LIBTOOL
64AC_ARG_WITH(imagemagick, 65AC_ARG_WITH(imagemagick,
65 [ --with-imagemagick enable ImageMagick (default = yes)], 66 [ --with-imagemagick enable ImageMagick (default = yes)],
66 [IMAGEMAGICK=$withval], 67 [IMAGEMAGICK=$withval],
67 [IMAGEMAGICK='yes']) 68 [IMAGEMAGICK='yes'])
68if test x"$IMAGEMAGICK" != xno ; then 69if test x"$IMAGEMAGICK" != xno ; then
69 AC_CHECK_LIB(Magick,ConstituteImage,IMAGEMAGICK=yes,IMAGEMAGICK=no) 70 AC_CHECK_PROG(IMAGEMAGICK,Magick-config,yes,no)
70 if test x"$IMAGEMAGICK" != xno ; then 71 if test x"$IMAGEMAGICK" != xno ; then
72 CFLAGS_OLD="$CFLAGS"
73 CPPFLAGS_OLD="$CPPFLAGS"
74 LDFLAGS_OLD="$LDFLAGS"
71 LIBS_SAVE="$LIBS" 75 LIBS_OLD="$LIBS"
72 LIBS="$LIBS -lMagick" 76 CFLAGS="$CFLAGS `Magick-config --cflags`"
77 CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
78 LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
79 LIBS="$LIBS `Magick-config --libs`"
80
73 AC_MSG_CHECKING(whether GetMagickInfo works) 81 AC_MSG_CHECKING(whether GetMagickInfo works)
74 AC_TRY_RUN([ #include <magick/magick.h> 82 AC_TRY_RUN([ #include <magick/magick.h>
75 #include <stdio.h> 83 int main(void) { ExceptionInfo exception;
76 int main(void) { MagickInfo *mi;GetMagickInfo(NULL); 84 GetExceptionInfo(&exception);
77 #if defined(HasLTDL)
78 OpenModules(); 85 OpenModules(&exception);
79 #endif
80 return (NULL != GetMagickInfo(NULL)); }], 86 return (NULL == GetMagickInfo(NULL,&exception)); }],
81 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes) 87 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes)
82 AC_MSG_RESULT($IMAGEMAGICK) 88 AC_MSG_RESULT($IMAGEMAGICK)
89 LDFLAGS="$LDFLAGS_OLD"
83 LIBS="$LIBS_SAVE" 90 LIBS="$LIBS_OLD"
91dnl Note: CFLAGS can't be set for single directories, so we propagate them
92 if test x"$IMAGEMAGICK" = xno ; then
93 CFLAGS="$CFLAGS_OLD"
94 CPPFLAGS="$CPPFLAGS_OLD"
95 fi
84 fi 96 fi
85 if test x"$IMAGEMAGICK" = xno ; then
86 AC_MSG_WARN(ImageMagick support disabled!)
87 fi
88fi 97fi
89if test x"$IMAGEMAGICK" = xyes ; then 98if test x"$IMAGEMAGICK" = xyes ; then
90 LIB_MAGICK=-lMagick 99 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
91 AC_DEFINE(IMAGEMAGICK) 100 AC_DEFINE(IMAGEMAGICK,1,[ImageMagick availability])
92else 101else
93 LIB_MAGICK= 102 LIB_MAGICK=
94fi 103fi
95AC_SUBST(LIB_MAGICK) 104AC_SUBST(LIB_MAGICK)
96 105
166AC_SUBST(INT_32_BIT) 175AC_SUBST(INT_32_BIT)
167 176
168dnl Checks for library functions. 177dnl Checks for library functions.
169AC_FUNC_VPRINTF 178AC_FUNC_VPRINTF
170AC_REPLACE_FUNCS(strdup) 179AC_REPLACE_FUNCS(strdup)
171AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") 180AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.lo getopt1.lo")
172 181
173 182
174dnl With and without functions 183dnl With and without functions
175AC_ARG_ENABLE(html-docs, 184AC_ARG_ENABLE(html-docs,
176[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)], 185[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)],
207 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;; 216 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;;
208esac],[rtfdocs=false]) 217esac],[rtfdocs=false])
209AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue) 218AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
210 219
211 220
212AC_OUTPUT([Makefile compat/Makefile lib/Makefile psiconv/Makefile lib/general.h formats/Makefile docs/Makefile]) 221AC_CONFIG_FILES([Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/general.h formats/Makefile docs/Makefile extra/Makefile])
222AC_OUTPUT

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

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