/[public]/psiconv/trunk/configure

Diff of /psiconv/trunk/configure

Parent Directory | Revision Log | View Patch Patch

Revision 52		Revision 57
…		…
713	fi	713	fi
714		714
715		715
716	PACKAGE=psiconv	716	PACKAGE=psiconv
717		717
718	VERSION=0.6.1	718	VERSION=0.6.3
719		719
720	if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then	720	if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
721	{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }	721	{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
722	fi	722	fi
723	cat >> confdefs.h <<EOF	723	cat >> confdefs.h <<EOF
…		…
1550	else	1550	else
1551	IMAGEMAGICK='yes'	1551	IMAGEMAGICK='yes'
1552	fi	1552	fi
1553		1553
1554	if test x"$IMAGEMAGICK" != xno ; then	1554	if test x"$IMAGEMAGICK" != xno ; then
1555	echo $ac_n "checking for ConstituteImage in -lMagick""... $ac_c" 1>&6	1555	# Extract the first word of "Magick-config", so it can be a program name with args.
1556	echo "configure:1557: checking for ConstituteImage in -lMagick" >&5	1556	set dummy Magick-config; ac_word=$2
1557	ac_lib_var=`echo Magick'_'ConstituteImage \| sed 'y%./+-%__p_%'`	1557	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
		1558	echo "configure:1559: checking for $ac_word" >&5
1558	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then	1559	if eval "test \"`echo '$''{'ac_cv_prog_IMAGEMAGICK'+set}'`\" = set"; then
1559	echo $ac_n "(cached) $ac_c" 1>&6	1560	echo $ac_n "(cached) $ac_c" 1>&6
1560	else	1561	else
1561	ac_save_LIBS="$LIBS"	1562	if test -n "$IMAGEMAGICK"; then
1562	LIBS="-lMagick $LIBS"	1563	ac_cv_prog_IMAGEMAGICK="$IMAGEMAGICK" # Let the user override the test.
1563	cat > conftest.$ac_ext <<EOF
1564	#line 1565 "configure"
1565	#include "confdefs.h"
1566	/* Override any gcc2 internal prototype to avoid an error. */
1567	/* We use char because int might match the return type of a gcc2
1568	builtin and then its argument prototype would still apply. */
1569	char ConstituteImage();
1570
1571	int main() {
1572	ConstituteImage()
1573	; return 0; }
1574	EOF
1575	if { (eval echo configure:1576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1576	rm -rf conftest*
1577	eval "ac_cv_lib_$ac_lib_var=yes"
1578	else	1564	else
1579	echo "configure: failed program was:" >&5	1565	IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
1580	cat conftest.$ac_ext >&5	1566	ac_dummy="$PATH"
1581	rm -rf conftest*	1567	for ac_dir in $ac_dummy; do
1582	eval "ac_cv_lib_$ac_lib_var=no"	1568	test -z "$ac_dir" && ac_dir=.
		1569	if test -f $ac_dir/$ac_word; then
		1570	ac_cv_prog_IMAGEMAGICK="yes"
		1571	break
		1572	fi
		1573	done
		1574	IFS="$ac_save_ifs"
		1575	test -z "$ac_cv_prog_IMAGEMAGICK" && ac_cv_prog_IMAGEMAGICK="no"
1583	fi	1576	fi
1584	rm -f conftest*
1585	LIBS="$ac_save_LIBS"
1586
1587	fi	1577	fi
1588	if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then	1578	IMAGEMAGICK="$ac_cv_prog_IMAGEMAGICK"
1589	echo "$ac_t""yes" 1>&6	1579	if test -n "$IMAGEMAGICK"; then
1590	IMAGEMAGICK=yes	1580	echo "$ac_t""$IMAGEMAGICK" 1>&6
1591	else	1581	else
1592	echo "$ac_t""no" 1>&6	1582	echo "$ac_t""no" 1>&6
1593	IMAGEMAGICK=no
1594	fi	1583	fi
1595		1584
1596	if test x"$IMAGEMAGICK" != xno ; then	1585	if test x"$IMAGEMAGICK" != xno ; then
		1586	CFLAGS_OLD="$CFLAGS"
		1587	CPPFLAGS_OLD="$CPPFLAGS"
		1588	LDFLAGS_OLD="$LDFLAGS"
1597	LIBS_SAVE="$LIBS"	1589	LIBS_OLD="$LIBS"
1598	LIBS="$LIBS -lMagick"	1590	CFLAGS="$CFLAGS `Magick-config --cflags`"
		1591	CPPFLAGS="$CPPFLAGS `Magick-config --cppflags`"
		1592	LDFLAGS="$LDFLAGS `Magick-config --ldflags`"
		1593	LIBS="$LIBS `Magick-config --libs`"
		1594
1599	echo $ac_n "checking whether GetMagickInfo works""... $ac_c" 1>&6	1595	echo $ac_n "checking whether GetMagickInfo works""... $ac_c" 1>&6
1600	echo "configure:1601: checking whether GetMagickInfo works" >&5	1596	echo "configure:1597: checking whether GetMagickInfo works" >&5
1601	if test "$cross_compiling" = yes; then	1597	if test "$cross_compiling" = yes; then
1602	IMAGEMAGICK=yes	1598	IMAGEMAGICK=yes
1603	else	1599	else
1604	cat > conftest.$ac_ext <<EOF	1600	cat > conftest.$ac_ext <<EOF
1605	#line 1606 "configure"	1601	#line 1602 "configure"
1606	#include "confdefs.h"	1602	#include "confdefs.h"
1607	#include <magick/magick.h>	1603	#include <magick/magick.h>
		1604	#include <magick/config.h>
1608	#include <stdio.h>	1605	#include <stdio.h>
		1606	extern void OpenModules(void);
1609	int main(void) { MagickInfo *mi;GetMagickInfo(NULL);	1607	int main(void) { GetMagickInfo(NULL);
1610	#if defined(HasLTDL)	1608	#if defined(HasLTDL)
1611	OpenModules();	1609	OpenModules();
1612	#endif	1610	#endif
1613	return (NULL != GetMagickInfo(NULL)); }	1611	return (NULL == GetMagickInfo(NULL)); }
1614	EOF	1612	EOF
1615	if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null	1613	if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1616	then	1614	then
1617	IMAGEMAGICK=yes	1615	IMAGEMAGICK=yes
1618	else	1616	else
1619	echo "configure: failed program was:" >&5	1617	echo "configure: failed program was:" >&5
1620	cat conftest.$ac_ext >&5	1618	cat conftest.$ac_ext >&5
…		…
1623	fi	1621	fi
1624	rm -fr conftest*	1622	rm -fr conftest*
1625	fi	1623	fi
1626		1624
1627	echo "$ac_t""$IMAGEMAGICK" 1>&6	1625	echo "$ac_t""$IMAGEMAGICK" 1>&6
		1626	LDFLAGS="$LDFLAGS_OLD"
1628	LIBS="$LIBS_SAVE"	1627	LIBS="$LIBS_OLD"
		1628	if test x"$IMAGEMAGICK" = xno ; then
		1629	CFLAGS="$CFLAGS_OLD"
		1630	CPPFLAGS="$CPPFLAGS_OLD"
		1631	fi
1629	fi	1632	fi
1630	if test x"$IMAGEMAGICK" = xno ; then
1631	echo "configure: warning: ImageMagick support disabled!" 1>&2
1632	fi
1633	fi	1633	fi
1634	if test x"$IMAGEMAGICK" = xyes ; then	1634	if test x"$IMAGEMAGICK" = xyes ; then
1635	LIB_MAGICK=-lMagick	1635	LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
1636	cat >> confdefs.h <<\EOF	1636	cat >> confdefs.h <<\EOF
1637	#define IMAGEMAGICK 1	1637	#define IMAGEMAGICK 1
1638	EOF	1638	EOF
1639		1639
1640	else	1640	else
…		…
2658	s%@RANLIB@%$RANLIB%g	2658	s%@RANLIB@%$RANLIB%g
2659	s%@CC@%$CC%g	2659	s%@CC@%$CC%g
2660	s%@LN_S@%$LN_S%g	2660	s%@LN_S@%$LN_S%g
2661	s%@LIBTOOL@%$LIBTOOL%g	2661	s%@LIBTOOL@%$LIBTOOL%g
2662	s%@cflags_set@%$cflags_set%g	2662	s%@cflags_set@%$cflags_set%g
		2663	s%@IMAGEMAGICK@%$IMAGEMAGICK%g
2663	s%@LIB_MAGICK@%$LIB_MAGICK%g	2664	s%@LIB_MAGICK@%$LIB_MAGICK%g
2664	s%@CPP@%$CPP%g	2665	s%@CPP@%$CPP%g
2665	s%@INT_8_BIT@%$INT_8_BIT%g	2666	s%@INT_8_BIT@%$INT_8_BIT%g
2666	s%@INT_16_BIT@%$INT_16_BIT%g	2667	s%@INT_16_BIT@%$INT_16_BIT%g
2667	s%@INT_32_BIT@%$INT_32_BIT%g	2668	s%@INT_32_BIT@%$INT_32_BIT%g

 Legend:



Removed from v.52
 


changed lines


 
Added in v.57
 Legend:



Removed from v.52
 


changed lines


 
Added in v.57
-Removed from v.52
+Added in v.57

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