/[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 70 Revision 152
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.7.1) 4AM_INIT_AUTOMAKE(psiconv,0.8.4)
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
… …
75 CFLAGS="$CFLAGS `Magick-config --cflags`" 76 CFLAGS="$CFLAGS `Magick-config --cflags`"
76 CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`" 77 CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
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
81
80 AC_MSG_CHECKING(whether GetMagickInfo works) 82 AC_MSG_CHECKING(whether GetMagickInfo works and which API to use)
83 AC_TRY_RUN([ #include <stdio.h>
84 #include <magick/api.h>
85 int main(void) { ExceptionInfo exception;
86 GetExceptionInfo(&exception);
87 OpenModules(&exception);
88 return (NULL == GetMagickInfo(NULL,&exception)); }],
89 IMAGEMAGICK=new,IMAGEMAGICK=no,IMAGEMAGICK=no)
90 if test x"$IMAGEMAGICK" = xno ; then
81 AC_TRY_RUN([ #include <magick/magick.h> 91 AC_TRY_RUN([ #include <magick/magick.h>
82 #include <magick/config.h> 92 int main(void) { ExceptionInfo exception;
83 #include <stdio.h> 93 GetExceptionInfo(&exception);
84 extern void OpenModules(void);
85 int main(void) { GetMagickInfo(NULL);
86 #if defined(HasLTDL)
87 OpenModules(); 94 OpenModules(&exception);
88 #endif
89 return (NULL == GetMagickInfo(NULL)); }], 95 return (NULL == GetMagickInfo(NULL,&exception)); }],
90 IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes) 96 IMAGEMAGICK=old,IMAGEMAGICK=no,IMAGEMAGICK=no)
97 fi
91 AC_MSG_RESULT($IMAGEMAGICK) 98 AC_MSG_RESULT($IMAGEMAGICK)
92 LDFLAGS="$LDFLAGS_OLD" 99 LDFLAGS="$LDFLAGS_OLD"
93 LIBS="$LIBS_OLD" 100 LIBS="$LIBS_OLD"
94dnl 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
95 if test x"$IMAGEMAGICK" = xno ; then 102 if test x"$IMAGEMAGICK" = xno ; then
96 CFLAGS="$CFLAGS_OLD" 103 CFLAGS="$CFLAGS_OLD"
97 CPPFLAGS="$CPPFLAGS_OLD" 104 CPPFLAGS="$CPPFLAGS_OLD"
98 fi 105 fi
99 fi 106 fi
100fi 107fi
101if test x"$IMAGEMAGICK" = xyes ; then 108if test x"$IMAGEMAGICK" != xno ; then
102 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`" 109 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
103 AC_DEFINE(IMAGEMAGICK) 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
104else 114else
105 LIB_MAGICK= 115 LIB_MAGICK=
106fi 116fi
107AC_SUBST(LIB_MAGICK) 117AC_SUBST(LIB_MAGICK)
108 118
… …
128 AC_MSG_RESULT(char) 138 AC_MSG_RESULT(char)
129elif test $ac_cv_sizeof_short -ge 1 ; then 139elif test $ac_cv_sizeof_short -ge 1 ; then
130 INT_8_BIT=short 140 INT_8_BIT=short
131 AC_MSG_RESULT(short) 141 AC_MSG_RESULT(short)
132elif test $ac_cv_sizeof_int -ge 1 ; then 142elif test $ac_cv_sizeof_int -ge 1 ; then
133 INT_8_BIT=int
134 AC_MSG_RESULT(int) 143 AC_MSG_RESULT(int)
135elif test $ac_cv_sizeof_long -ge 1 ; then 144elif test $ac_cv_sizeof_long -ge 1 ; then
136 INT_8_BIT=long 145 INT_8_BIT=long
137 AC_MSG_RESULT(long) 146 AC_MSG_RESULT(long)
138else 147else
… …
178AC_SUBST(INT_32_BIT) 187AC_SUBST(INT_32_BIT)
179 188
180dnl Checks for library functions. 189dnl Checks for library functions.
181AC_FUNC_VPRINTF 190AC_FUNC_VPRINTF
182AC_REPLACE_FUNCS(strdup) 191AC_REPLACE_FUNCS(strdup)
183AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o") 192AC_CHECK_FUNCS(getopt_long,,AC_LIBOBJ([getopt]);AC_LIBOBJ([getopt1]))
184 193
194AC_ARG_ENABLE(dmalloc,
195[ --enable-dmalloc Enable dmalloc for developers (default:off)],
196[case "${enableval}" in
197 yes) dmalloc=yes ;;
198 no) dmalloc=no ;;
199 *) AC_MSG_ERROR(bad value ${enableval} for --enable-dmalloc) ;;
200esac],[dmalloc=false])
201if test x"$dmalloc" = xyes; then
202 AC_CHECK_LIB(dmalloc,malloc,dmalloc=yes,dmalloc=no)
203fi
204if test x"$dmalloc" = xyes; then
205AC_CHECK_HEADER(dmalloc.h,dmalloc=yes,dmalloc=no)
206fi
207if test x"$dmalloc" = xyes ; then
208 LIB_DMALLOC=-ldmalloc
209 AC_DEFINE(DMALLOC,1,[DMalloc availability])
210else
211 LIB_DMALLOC=
212fi
213AC_SUBST(LIB_DMALLOC)
185 214
186dnl With and without functions 215dnl With and without functions
187AC_ARG_ENABLE(html-docs, 216AC_ARG_ENABLE(html-docs,
188[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)], 217[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)],
189[case "${enableval}" in 218[case "${enableval}" in
… …
219 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;; 248 *) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;;
220esac],[rtfdocs=false]) 249esac],[rtfdocs=false])
221AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue) 250AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
222 251
223 252
224AC_OUTPUT([Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/general.h formats/Makefile docs/Makefile]) 253AC_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])
254AC_OUTPUT
Legend:
Removed from v.70  
changed lines
  Added in v.152
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26