/[public]/psiconv/trunk/configure
ViewVC logotype

Diff of /psiconv/trunk/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 52 Revision 58
473# AIX cpp loses on an empty file, so make sure it contains at least a newline. 473# AIX cpp loses on an empty file, so make sure it contains at least a newline.
474echo > confdefs.h 474echo > confdefs.h
475 475
476# A filename unique to this package, relative to the directory that 476# A filename unique to this package, relative to the directory that
477# configure is in, which we can look for to find out if srcdir is correct. 477# configure is in, which we can look for to find out if srcdir is correct.
478ac_unique_file=psiconv 478ac_unique_file=lib/psiconv
479 479
480# Find the source files, if location was not specified. 480# Find the source files, if location was not specified.
481if test -z "$srcdir"; then 481if test -z "$srcdir"; then
482 ac_srcdir_defaulted=yes 482 ac_srcdir_defaulted=yes
483 # Try the directory containing this script, then its parent. 483 # Try the directory containing this script, then its parent.
713fi 713fi
714 714
715 715
716PACKAGE=psiconv 716PACKAGE=psiconv
717 717
718VERSION=0.6.1 718VERSION=0.6.3
719 719
720if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then 720if 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; }
722fi 722fi
723cat >> confdefs.h <<EOF 723cat >> confdefs.h <<EOF
1550else 1550else
1551 IMAGEMAGICK='yes' 1551 IMAGEMAGICK='yes'
1552fi 1552fi
1553 1553
1554if test x"$IMAGEMAGICK" != xno ; then 1554if 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.
1556echo "configure:1557: checking for ConstituteImage in -lMagick" >&5 1556set dummy Magick-config; ac_word=$2
1557ac_lib_var=`echo Magick'_'ConstituteImage | sed 'y%./+-%__p_%'` 1557echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1558echo "configure:1559: checking for $ac_word" >&5
1558if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then 1559if 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
1560else 1561else
1561 ac_save_LIBS="$LIBS" 1562 if test -n "$IMAGEMAGICK"; then
1562LIBS="-lMagick $LIBS" 1563 ac_cv_prog_IMAGEMAGICK="$IMAGEMAGICK" # Let the user override the test.
1563cat > 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. */
1569char ConstituteImage();
1570
1571int main() {
1572ConstituteImage()
1573; return 0; }
1574EOF
1575if { (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"
1578else 1564else
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"
1583fi 1576fi
1584rm -f conftest*
1585LIBS="$ac_save_LIBS"
1586
1587fi 1577fi
1588if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 1578IMAGEMAGICK="$ac_cv_prog_IMAGEMAGICK"
1589 echo "$ac_t""yes" 1>&6 1579if test -n "$IMAGEMAGICK"; then
1590 IMAGEMAGICK=yes 1580 echo "$ac_t""$IMAGEMAGICK" 1>&6
1591else 1581else
1592 echo "$ac_t""no" 1>&6 1582 echo "$ac_t""no" 1>&6
1593IMAGEMAGICK=no
1594fi 1583fi
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
1600echo "configure:1601: checking whether GetMagickInfo works" >&5 1596echo "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
1603else 1599else
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)); }
1614EOF 1612EOF
1615if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 1613if { (eval echo configure:1614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1616then 1614then
1617 IMAGEMAGICK=yes 1615 IMAGEMAGICK=yes
1618else 1616else
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
1623fi 1621fi
1624rm -fr conftest* 1622rm -fr conftest*
1625fi 1623fi
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
1633fi 1633fi
1634if test x"$IMAGEMAGICK" = xyes ; then 1634if 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
1638EOF 1638EOF
1639 1639
1640else 1640else
2600done 2600done
2601 2601
2602ac_given_srcdir=$srcdir 2602ac_given_srcdir=$srcdir
2603ac_given_INSTALL="$INSTALL" 2603ac_given_INSTALL="$INSTALL"
2604 2604
2605trap 'rm -fr `echo "Makefile compat/Makefile lib/Makefile psiconv/Makefile lib/general.h formats/Makefile docs/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 2605trap 'rm -fr `echo "Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/general.h formats/Makefile docs/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
2606EOF 2606EOF
2607cat >> $CONFIG_STATUS <<EOF 2607cat >> $CONFIG_STATUS <<EOF
2608 2608
2609# Protect against being on the right side of a sed subst in config.status. 2609# Protect against being on the right side of a sed subst in config.status.
2610sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; 2610sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
2658s%@RANLIB@%$RANLIB%g 2658s%@RANLIB@%$RANLIB%g
2659s%@CC@%$CC%g 2659s%@CC@%$CC%g
2660s%@LN_S@%$LN_S%g 2660s%@LN_S@%$LN_S%g
2661s%@LIBTOOL@%$LIBTOOL%g 2661s%@LIBTOOL@%$LIBTOOL%g
2662s%@cflags_set@%$cflags_set%g 2662s%@cflags_set@%$cflags_set%g
2663s%@IMAGEMAGICK@%$IMAGEMAGICK%g
2663s%@LIB_MAGICK@%$LIB_MAGICK%g 2664s%@LIB_MAGICK@%$LIB_MAGICK%g
2664s%@CPP@%$CPP%g 2665s%@CPP@%$CPP%g
2665s%@INT_8_BIT@%$INT_8_BIT%g 2666s%@INT_8_BIT@%$INT_8_BIT%g
2666s%@INT_16_BIT@%$INT_16_BIT%g 2667s%@INT_16_BIT@%$INT_16_BIT%g
2667s%@INT_32_BIT@%$INT_32_BIT%g 2668s%@INT_32_BIT@%$INT_32_BIT%g
2713fi 2714fi
2714EOF 2715EOF
2715 2716
2716cat >> $CONFIG_STATUS <<EOF 2717cat >> $CONFIG_STATUS <<EOF
2717 2718
2718CONFIG_FILES=\${CONFIG_FILES-"Makefile compat/Makefile lib/Makefile psiconv/Makefile lib/general.h formats/Makefile docs/Makefile"} 2719CONFIG_FILES=\${CONFIG_FILES-"Makefile compat/Makefile lib/Makefile lib/psiconv/Makefile program/Makefile program/psiconv/Makefile lib/psiconv/general.h formats/Makefile docs/Makefile"}
2719EOF 2720EOF
2720cat >> $CONFIG_STATUS <<\EOF 2721cat >> $CONFIG_STATUS <<\EOF
2721for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then 2722for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
2722 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 2723 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
2723 case "$ac_file" in 2724 case "$ac_file" in

Legend:
Removed from v.52  
changed lines
  Added in v.58

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