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

Diff of /psiconv/trunk/configure.in

Parent Directory | Revision Log | View Patch Patch

Revision 148		Revision 193
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.4)	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)
82	AC_TRY_RUN([ #include <magick/magick.h>	83	AC_TRY_RUN([ #include <stdio.h>
		84	#include <magick/api.h>
83	int main(void) { ExceptionInfo exception;	85	int main(void) { ExceptionInfo exception;
84	GetExceptionInfo(&exception);	86	GetExceptionInfo(&exception);
85	OpenModules(&exception);	87	OpenModules(&exception);
86	return (NULL == GetMagickInfo(NULL,&exception)); }],	88	return (NULL == GetMagickInfo(NULL,&exception)); }],
87	IMAGEMAGICK=yes,IMAGEMAGICK=no,IMAGEMAGICK=yes)	89	IMAGEMAGICK=new,IMAGEMAGICK=no,IMAGEMAGICK=no)
		90	if test x"$IMAGEMAGICK" = xno ; then
		91	AC_TRY_RUN([ #include <magick/magick.h>
		92	int main(void) { ExceptionInfo exception;
		93	GetExceptionInfo(&exception);
		94	OpenModules(&exception);
		95	return (NULL == GetMagickInfo(NULL,&exception)); }],
		96	IMAGEMAGICK=old,IMAGEMAGICK=no,IMAGEMAGICK=no)
		97	fi
88	AC_MSG_RESULT($IMAGEMAGICK)	98	AC_MSG_RESULT($IMAGEMAGICK)
89	LDFLAGS="$LDFLAGS_OLD"	99	LDFLAGS="$LDFLAGS_OLD"
90	LIBS="$LIBS_OLD"	100	LIBS="$LIBS_OLD"
91	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
92	if test x"$IMAGEMAGICK" = xno ; then	102	if test x"$IMAGEMAGICK" = xno ; then
93	CFLAGS="$CFLAGS_OLD"	103	CFLAGS="$CFLAGS_OLD"
94	CPPFLAGS="$CPPFLAGS_OLD"	104	CPPFLAGS="$CPPFLAGS_OLD"
95	fi	105	fi
96	fi	106	fi
97	fi	107	fi
98	if test x"$IMAGEMAGICK" = xyes ; then	108	if test x"$IMAGEMAGICK" != xno ; then
99	LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"	109	LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
100	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
101	else	114	else
102	LIB_MAGICK=	115	LIB_MAGICK=
103	fi	116	fi
104	AC_SUBST(LIB_MAGICK)	117	AC_SUBST(LIB_MAGICK)
105		118
…		…
125	AC_MSG_RESULT(char)	138	AC_MSG_RESULT(char)
126	elif test $ac_cv_sizeof_short -ge 1 ; then	139	elif test $ac_cv_sizeof_short -ge 1 ; then
127	INT_8_BIT=short	140	INT_8_BIT=short
128	AC_MSG_RESULT(short)	141	AC_MSG_RESULT(short)
129	elif test $ac_cv_sizeof_int -ge 1 ; then	142	elif test $ac_cv_sizeof_int -ge 1 ; then
130	INT_8_BIT=int
131	AC_MSG_RESULT(int)	143	AC_MSG_RESULT(int)
132	elif test $ac_cv_sizeof_long -ge 1 ; then	144	elif test $ac_cv_sizeof_long -ge 1 ; then
133	INT_8_BIT=long	145	INT_8_BIT=long
134	AC_MSG_RESULT(long)	146	AC_MSG_RESULT(long)
135	else	147	else
…		…
175	AC_SUBST(INT_32_BIT)	187	AC_SUBST(INT_32_BIT)
176		188
177	dnl Checks for library functions.	189	dnl Checks for library functions.
178	AC_FUNC_VPRINTF	190	AC_FUNC_VPRINTF
179	AC_REPLACE_FUNCS(strdup)	191	AC_REPLACE_FUNCS(strdup)
180	AC_CHECK_FUNCS(getopt_long,,AC_LIBOBJ([getopt]);AC_LIBOBJ([getopt1]))	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
181		197
182	AC_ARG_ENABLE(dmalloc,	198	AC_ARG_ENABLE(dmalloc,
183	[ --enable-dmalloc Enable dmalloc for developers (default:off)],	199	[ --enable-dmalloc Enable dmalloc for developers (default:off)],
184	[case "${enableval}" in	200	[case "${enableval}" in
185	yes) dmalloc=yes ;;	201	yes) dmalloc=yes ;;
…		…
199	LIB_DMALLOC=	215	LIB_DMALLOC=
200	fi	216	fi
201	AC_SUBST(LIB_DMALLOC)	217	AC_SUBST(LIB_DMALLOC)
202		218
203	dnl With and without functions	219	dnl With and without functions
204	AC_ARG_ENABLE(html-docs,	220	AC_ARG_ENABLE(xhtml-docs,
205	[ --disable-html-docs Disable generation of HTML 3.2 docs (default: on)],	221	[ --disable-xhtml-docs Disable generation of XHTML docs (default: on)],
206	[case "${enableval}" in	222	[case "${enableval}" in
207	yes) htmldocs=true ;;	223	yes) xhtmldocs=true ;;
208	no) htmldocs=false ;;	224	no) xhtmldocs=false ;;
209	*) AC_MSG_ERROR(bad value ${enableval} for --enable-html-docs) ;;	225	*) AC_MSG_ERROR(bad value ${enableval} for --enable-xhtml-docs) ;;
210	esac],[htmldocs=true])	226	esac],[xhtmldocs=true])
211	AM_CONDITIONAL(HTMLDOCS,test x$htmldocs = xtrue)	227	AM_CONDITIONAL(XHTMLDOCS,test x$xhtmldocs = xtrue)
212		228
213	AC_ARG_ENABLE(html4-docs,	229	AC_ARG_ENABLE(html4-docs,
214	[ --enable-html4-docs Enable generation of HTML 4 docs (default: off)],	230	[ --enable-html4-docs Enable generation of HTML 4 docs (default: off)],
215	[case "${enableval}" in	231	[case "${enableval}" in
216	yes) html4docs=true ;;	232	yes) html4docs=true ;;
…		…
226	no) asciidocs=false ;;	242	no) asciidocs=false ;;
227	*) AC_MSG_ERROR(bad value ${enableval} for --enable-ascii-docs) ;;	243	*) AC_MSG_ERROR(bad value ${enableval} for --enable-ascii-docs) ;;
228	esac],[asciidocs=false])	244	esac],[asciidocs=false])
229	AM_CONDITIONAL(ASCIIDOCS,test x$asciidocs = xtrue)	245	AM_CONDITIONAL(ASCIIDOCS,test x$asciidocs = xtrue)
230		246
231	AC_ARG_ENABLE(rtf-docs,
232	[ --enable-rtf-docs Enable generation of RTF docs (default: off)],
233	[case "${enableval}" in
234	yes) rtfdocs=true ;;
235	no) rtfdocs=false ;;
236	*) AC_MSG_ERROR(bad value ${enableval} for --enable-rtf-docs) ;;
237	esac],[rtfdocs=false])
238	AM_CONDITIONAL(RTFDOCS,test x$rtfdocs = xtrue)
239
240
241	AC_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])	247	AC_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])
242	AC_OUTPUT	248	AC_OUTPUT

 Legend:



Removed from v.148
 


changed lines


 
Added in v.193
 Legend:



Removed from v.148
 


changed lines


 
Added in v.193
-Removed from v.148
+Added in v.193

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