/[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 58 Revision 126
1dnl Process this file with autoconf to produce a configure script. 1dnl Process this file with autoconf to produce a configure script.
2AC_INIT(lib/psiconv) 2AC_INIT
3AC_CONFIG_SRCDIR([lib/psiconv])
3AM_INIT_AUTOMAKE(psiconv,0.6.3) 4AM_INIT_AUTOMAKE(psiconv,0.8.2)
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
… …
77 LDFLAGS="$LDFLAGS `Magick-config --ldflags`" 78 LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
78 LIBS="$LIBS `Magick-config --libs`" 79 LIBS="$LIBS `Magick-config --libs`"
79 80
80 AC_MSG_CHECKING(whether GetMagickInfo works) 81 AC_MSG_CHECKING(whether GetMagickInfo works)
81 AC_TRY_RUN([ #include <magick/magick.h> 82 AC_TRY_RUN([ #include <magick/magick.h>
82 #include <magick/config.h>
83 #include <stdio.h>
84 extern void OpenModules(void);
85 int main(void) { GetMagickInfo(NULL); 83 int main(void) { ExceptionInfo exception;
86 #if defined(HasLTDL) 84 GetExceptionInfo(&exception);
87 OpenModules(); 85 OpenModules(&exception);
88 #endif
89 return (NULL == GetMagickInfo(NULL)); }], 86 return (NULL == GetMagickInfo(NULL,&exception)); }],
90 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes) 87 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes)
91 AC_MSG_RESULT($IMAGEMAGICK) 88 AC_MSG_RESULT($IMAGEMAGICK)
92 LDFLAGS="$LDFLAGS_OLD" 89 LDFLAGS="$LDFLAGS_OLD"
93 LIBS="$LIBS_OLD" 90 LIBS="$LIBS_OLD"
94dnl Note: CFLAGS can't be set for single directories, so we propagate them 91dnl Note: CFLAGS can't be set for single directories, so we propagate them
… …
98 fi 95 fi
99 fi 96 fi
100fi 97fi
101if test x"$IMAGEMAGICK" = xyes ; then 98if test x"$IMAGEMAGICK" = xyes ; then
102 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`" 99 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
103 AC_DEFINE(IMAGEMAGICK) 100 AC_DEFINE(IMAGEMAGICK,1,[ImageMagick availability])
104else 101else
105 LIB_MAGICK= 102 LIB_MAGICK=
106fi 103fi
107AC_SUBST(LIB_MAGICK) 104AC_SUBST(LIB_MAGICK)
108 105
… …
178AC_SUBST(INT_32_BIT) 175AC_SUBST(INT_32_BIT)
179 176
180dnl Checks for library functions. 177dnl Checks for library functions.
181AC_FUNC_VPRINTF 178AC_FUNC_VPRINTF
182AC_REPLACE_FUNCS(strdup) 179AC_REPLACE_FUNCS(strdup)
183AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") 180AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.lo getopt1.lo")
184 181
185 182
186dnl With and without functions 183dnl With and without functions
187AC_ARG_ENABLE(html-docs, 184AC_ARG_ENABLE(html-docs,
188[ --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)],
… …
219 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;; 216 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;;
220esac],[rtfdocs=false]) 217esac],[rtfdocs=false])
221AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue) 218AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
222 219
223 220
224AC_OUTPUT([Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/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.58  
changed lines
  Added in v.126
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26