--- psiconv/trunk/configure.in 2001/06/17 18:44:28 116 +++ psiconv/trunk/configure.in 2002/01/29 18:38:38 142 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT AC_CONFIG_SRCDIR([lib/psiconv]) -AM_INIT_AUTOMAKE(psiconv,0.8.1) +AM_INIT_AUTOMAKE(psiconv,0.8.2) AM_CONFIG_HEADER(config.h) @@ -80,14 +80,10 @@ AC_MSG_CHECKING(whether GetMagickInfo works) AC_TRY_RUN([ #include - #include - #include - extern void OpenModules(void); - int main(void) { GetMagickInfo(NULL); - #if defined(HasLTDL) - OpenModules(); - #endif - return (NULL == GetMagickInfo(NULL)); }], + int main(void) { ExceptionInfo exception; + GetExceptionInfo(&exception); + OpenModules(&exception); + return (NULL == GetMagickInfo(NULL,&exception)); }], IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes) AC_MSG_RESULT($IMAGEMAGICK) LDFLAGS="$LDFLAGS_OLD" @@ -183,6 +179,26 @@ AC_REPLACE_FUNCS(strdup) AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.lo getopt1.lo") +AC_ARG_ENABLE(dmalloc, +[ --enable-dmalloc Enable dmalloc for developers (default:off)], +[case "${enableval}" in + yes) dmalloc=yes ;; + no) dmalloc=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-dmalloc) ;; +esac],[dmalloc=false]) +if test x"$dmalloc" = xyes; then + AC_CHECK_LIB(dmalloc,malloc,dmalloc=yes,dmalloc=no) +fi +if test x"$dmalloc" = xyes; then +AC_CHECK_HEADER(dmalloc.h,dmalloc=yes,dmalloc=no) +fi +if test x"$dmalloc" = xyes ; then + LIB_DMALLOC=-ldmalloc + AC_DEFINE(DMALLOC,1,[DMalloc availability]) +else + LIB_DMALLOC= +fi +AC_SUBST(LIB_DMALLOC) dnl With and without functions AC_ARG_ENABLE(html-docs,