/[public]/psiconv/trunk/configure.in

Diff of /psiconv/trunk/configure.in

Parent Directory | Revision Log | View Patch Patch

Revision 116		Revision 186
1	dnl Process this file with autoconf to produce a configure script.	1	dnl Process this file with autoconf to produce a configure script.
2	AC_INIT	2	AC_INIT
3	AC_CONFIG_SRCDIR([lib/psiconv])	3	AC_CONFIG_SRCDIR([lib/psiconv])
4	AM_INIT_AUTOMAKE(psiconv,0.8.1)	4	AM_INIT_AUTOMAKE(psiconv,0.9.0)
5		5
6	AM_CONFIG_HEADER(config.h)	6	AM_CONFIG_HEADER(config.h)
7		7
8	dnl Checks for programs.	8	dnl Checks for programs.
9	AM_PROG_LIBTOOL	9	AM_PROG_LIBTOOL
…		…
76	CFLAGS="$CFLAGS `Magick-config --cflags`"	76	CFLAGS="$CFLAGS `Magick-config --cflags`"
77	CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"	77	CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
78	LDFLAGS="$LDFLAGS `Magick-config --ldflags`"	78	LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
79	LIBS="$LIBS `Magick-config --libs`"	79	LIBS="$LIBS `Magick-config --libs`"
80		80
		81
81	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
82	AC_TRY_RUN([ #include <magick/magick.h>	91	AC_TRY_RUN([ #include <magick/magick.h>
83	#include <magick/config.h>	92	int main(void) { ExceptionInfo exception;
84	#include <stdio.h>	93	GetExceptionInfo(&exception);
85	extern void OpenModules(void);
86	int main(void) { GetMagickInfo(NULL);
87	#if defined(HasLTDL)
88	OpenModules();	94	OpenModules(&exception);
89	#endif
90	return (NULL == GetMagickInfo(NULL)); }],	95	return (NULL == GetMagickInfo(NULL,&exception)); }],
91	IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes)	96	IMAGEMAGICK=old,IMAGEMAGICK=no,IMAGEMAGICK=no)
		97	fi
92	AC_MSG_RESULT($IMAGEMAGICK)	98	AC_MSG_RESULT($IMAGEMAGICK)
93	LDFLAGS="$LDFLAGS_OLD"	99	LDFLAGS="$LDFLAGS_OLD"
94	LIBS="$LIBS_OLD"	100	LIBS="$LIBS_OLD"
95	dnl Note: CFLAGS can't be set for single directories, so we propagate them	101	dnl Note: CFLAGS can't be set for single directories, so we propagate them
96	if test x"$IMAGEMAGICK" = xno ; then	102	if test x"$IMAGEMAGICK" = xno ; then
97	CFLAGS="$CFLAGS_OLD"	103	CFLAGS="$CFLAGS_OLD"
98	CPPFLAGS="$CPPFLAGS_OLD"	104	CPPFLAGS="$CPPFLAGS_OLD"
99	fi	105	fi
100	fi	106	fi
101	fi	107	fi
102	if test x"$IMAGEMAGICK" = xyes ; then	108	if test x"$IMAGEMAGICK" != xno ; then
103	LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"	109	LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
104	AC_DEFINE(IMAGEMAGICK,1,[ImageMagick availability])	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
105	else	114	else
106	LIB_MAGICK=	115	LIB_MAGICK=
107	fi	116	fi
108	AC_SUBST(LIB_MAGICK)	117	AC_SUBST(LIB_MAGICK)
109		118
…		…
129	AC_MSG_RESULT(char)	138	AC_MSG_RESULT(char)
130	elif test $ac_cv_sizeof_short -ge 1 ; then	139	elif test $ac_cv_sizeof_short -ge 1 ; then
131	INT_8_BIT=short	140	INT_8_BIT=short
132	AC_MSG_RESULT(short)	141	AC_MSG_RESULT(short)
133	elif test $ac_cv_sizeof_int -ge 1 ; then	142	elif test $ac_cv_sizeof_int -ge 1 ; then
134	INT_8_BIT=int
135	AC_MSG_RESULT(int)	143	AC_MSG_RESULT(int)
136	elif test $ac_cv_sizeof_long -ge 1 ; then	144	elif test $ac_cv_sizeof_long -ge 1 ; then
137	INT_8_BIT=long	145	INT_8_BIT=long
138	AC_MSG_RESULT(long)	146	AC_MSG_RESULT(long)
139	else	147	else
…		…
179	AC_SUBST(INT_32_BIT)	187	AC_SUBST(INT_32_BIT)
180		188
181	dnl Checks for library functions.	189	dnl Checks for library functions.
182	AC_FUNC_VPRINTF	190	AC_FUNC_VPRINTF
183	AC_REPLACE_FUNCS(strdup)	191	AC_REPLACE_FUNCS(strdup)
184	AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.lo getopt1.lo")	192	AC_CHECK_FUNC(getopt_long,getopt=yes,getopt=no)
		193	if test $getopt = no; then
		194	AC_LIBOBJ([getopt])
		195	AC_LIBOBJ([getopt1])
		196	fi
185		197
		198	AC_ARG_ENABLE(dmalloc,
		199	[ --enable-dmalloc Enable dmalloc for developers (default:off)],
		200	[case "${enableval}" in
		201	yes) dmalloc=yes ;;
		202	no) dmalloc=no ;;
		203	*) AC_MSG_ERROR(bad value ${enableval} for --enable-dmalloc) ;;
		204	esac],[dmalloc=false])
		205	if test x"$dmalloc" = xyes; then
		206	AC_CHECK_LIB(dmalloc,malloc,dmalloc=yes,dmalloc=no)
		207	fi
		208	if test x"$dmalloc" = xyes; then
		209	AC_CHECK_HEADER(dmalloc.h,dmalloc=yes,dmalloc=no)
		210	fi
		211	if test x"$dmalloc" = xyes ; then
		212	LIB_DMALLOC=-ldmalloc
		213	AC_DEFINE(DMALLOC,1,[DMalloc availability])
		214	else
		215	LIB_DMALLOC=
		216	fi
		217	AC_SUBST(LIB_DMALLOC)
186		218
187	dnl With and without functions	219	dnl With and without functions
188	AC_ARG_ENABLE(html-docs,	220	AC_ARG_ENABLE(html-docs,
189	[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)],	221	[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)],
190	[case "${enableval}" in	222	[case "${enableval}" in

 Legend:



Removed from v.116
 


changed lines


 
Added in v.186
 Legend:



Removed from v.116
 


changed lines


 
Added in v.186
-Removed from v.116
+Added in v.186

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