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

Diff of /psiconv/trunk/configure

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

Revision 50 Revision 97
… …
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.8.1
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"
1589 LIBS_OLD="$LIBS"
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
1597 echo $ac_n "checking whether GetMagickInfo works""... $ac_c" 1>&6 1595 echo $ac_n "checking whether GetMagickInfo works""... $ac_c" 1>&6
1598echo "configure:1599: checking whether GetMagickInfo works" >&5 1596echo "configure:1597: checking whether GetMagickInfo works" >&5
1599 if test "$cross_compiling" = yes; then 1597 if test "$cross_compiling" = yes; then
1600 IMAGEMAGICK=yes 1598 IMAGEMAGICK=yes
1601else 1599else
1602 cat > conftest.$ac_ext <<EOF 1600 cat > conftest.$ac_ext <<EOF
1603#line 1604 "configure" 1601#line 1602 "configure"
1604#include "confdefs.h" 1602#include "confdefs.h"
1605 #include <magick/magick.h> 1603 #include <magick/magick.h>
1604 #include <magick/config.h>
1605 #include <stdio.h>
1606 extern void OpenModules(void);
1607 int main(void) { GetMagickInfo(NULL);
1608 #if defined(HasLTDL)
1609 OpenModules();
1610 #endif
1606 int main(void) { return (NULL == GetMagickInfo(NULL)) } 1611 return (NULL == GetMagickInfo(NULL)); }
1607EOF 1612EOF
1608if { (eval echo configure:1609: \"$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
1609then 1614then
1610 IMAGEMAGICK=yes 1615 IMAGEMAGICK=yes
1611else 1616else
1612 echo "configure: failed program was:" >&5 1617 echo "configure: failed program was:" >&5
1613 cat conftest.$ac_ext >&5 1618 cat conftest.$ac_ext >&5
… …
1616fi 1621fi
1617rm -fr conftest* 1622rm -fr conftest*
1618fi 1623fi
1619 1624
1620 echo "$ac_t""$IMAGEMAGICK" 1>&6 1625 echo "$ac_t""$IMAGEMAGICK" 1>&6
1626 LDFLAGS="$LDFLAGS_OLD"
1627 LIBS="$LIBS_OLD"
1628 if test x"$IMAGEMAGICK" = xno ; then
1629 CFLAGS="$CFLAGS_OLD"
1630 CPPFLAGS="$CPPFLAGS_OLD"
1631 fi
1621 fi 1632 fi
1622 if test x"$IMAGEMAGICK" = xno ; then
1623 echo "configure: warning: ImageMagick support disabled!" 1>&2
1624 fi
1625fi 1633fi
1626if test x"$IMAGEMAGICK" = xyes ; then 1634if test x"$IMAGEMAGICK" = xyes ; then
1627 LIB_MAGICK=-lMagick 1635 LIB_MAGICK="`Magick-config --libs` `Magick-config --ldflags`"
1628 cat >> confdefs.h <<\EOF 1636 cat >> confdefs.h <<\EOF
1629#define IMAGEMAGICK 1 1637#define IMAGEMAGICK 1
1630EOF 1638EOF
1631 1639
1632else 1640else
1633 LIB_MAGICK= 1641 LIB_MAGICK=
1634fi 1642fi
1635 1643
1636 1644
1637echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 1645echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
1638echo "configure:1639: checking how to run the C preprocessor" >&5 1646echo "configure:1647: checking how to run the C preprocessor" >&5
1639# On Suns, sometimes $CPP names a directory. 1647# On Suns, sometimes $CPP names a directory.
1640if test -n "$CPP" && test -d "$CPP"; then 1648if test -n "$CPP" && test -d "$CPP"; then
1641 CPP= 1649 CPP=
1642fi 1650fi
1643if test -z "$CPP"; then 1651if test -z "$CPP"; then
… …
1648 # substituted into the Makefile and "${CC-cc}" will confuse make. 1656 # substituted into the Makefile and "${CC-cc}" will confuse make.
1649 CPP="${CC-cc} -E" 1657 CPP="${CC-cc} -E"
1650 # On the NeXT, cc -E runs the code through the compiler's parser, 1658 # On the NeXT, cc -E runs the code through the compiler's parser,
1651 # not just through cpp. 1659 # not just through cpp.
1652 cat > conftest.$ac_ext <<EOF 1660 cat > conftest.$ac_ext <<EOF
1653#line 1654 "configure" 1661#line 1662 "configure"
1654#include "confdefs.h" 1662#include "confdefs.h"
1655#include <assert.h> 1663#include <assert.h>
1656Syntax Error 1664Syntax Error
1657EOF 1665EOF
1658ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1666ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1659{ (eval echo configure:1660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1667{ (eval echo configure:1668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1660ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1668ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1661if test -z "$ac_err"; then 1669if test -z "$ac_err"; then
1662 : 1670 :
1663else 1671else
1664 echo "$ac_err" >&5 1672 echo "$ac_err" >&5
1665 echo "configure: failed program was:" >&5 1673 echo "configure: failed program was:" >&5
1666 cat conftest.$ac_ext >&5 1674 cat conftest.$ac_ext >&5
1667 rm -rf conftest* 1675 rm -rf conftest*
1668 CPP="${CC-cc} -E -traditional-cpp" 1676 CPP="${CC-cc} -E -traditional-cpp"
1669 cat > conftest.$ac_ext <<EOF 1677 cat > conftest.$ac_ext <<EOF
1670#line 1671 "configure" 1678#line 1679 "configure"
1671#include "confdefs.h" 1679#include "confdefs.h"
1672#include <assert.h> 1680#include <assert.h>
1673Syntax Error 1681Syntax Error
1674EOF 1682EOF
1675ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1683ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1676{ (eval echo configure:1677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1684{ (eval echo configure:1685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1677ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1685ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1678if test -z "$ac_err"; then 1686if test -z "$ac_err"; then
1679 : 1687 :
1680else 1688else
1681 echo "$ac_err" >&5 1689 echo "$ac_err" >&5
1682 echo "configure: failed program was:" >&5 1690 echo "configure: failed program was:" >&5
1683 cat conftest.$ac_ext >&5 1691 cat conftest.$ac_ext >&5
1684 rm -rf conftest* 1692 rm -rf conftest*
1685 CPP="${CC-cc} -nologo -E" 1693 CPP="${CC-cc} -nologo -E"
1686 cat > conftest.$ac_ext <<EOF 1694 cat > conftest.$ac_ext <<EOF
1687#line 1688 "configure" 1695#line 1696 "configure"
1688#include "confdefs.h" 1696#include "confdefs.h"
1689#include <assert.h> 1697#include <assert.h>
1690Syntax Error 1698Syntax Error
1691EOF 1699EOF
1692ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1700ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1693{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1701{ (eval echo configure:1702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1694ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1702ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1695if test -z "$ac_err"; then 1703if test -z "$ac_err"; then
1696 : 1704 :
1697else 1705else
1698 echo "$ac_err" >&5 1706 echo "$ac_err" >&5
… …
1713 ac_cv_prog_CPP="$CPP" 1721 ac_cv_prog_CPP="$CPP"
1714fi 1722fi
1715echo "$ac_t""$CPP" 1>&6 1723echo "$ac_t""$CPP" 1>&6
1716 1724
1717echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 1725echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
1718echo "configure:1719: checking for ANSI C header files" >&5 1726echo "configure:1727: checking for ANSI C header files" >&5
1719if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then 1727if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
1720 echo $ac_n "(cached) $ac_c" 1>&6 1728 echo $ac_n "(cached) $ac_c" 1>&6
1721else 1729else
1722 cat > conftest.$ac_ext <<EOF 1730 cat > conftest.$ac_ext <<EOF
1723#line 1724 "configure" 1731#line 1732 "configure"
1724#include "confdefs.h" 1732#include "confdefs.h"
1725#include <stdlib.h> 1733#include <stdlib.h>
1726#include <stdarg.h> 1734#include <stdarg.h>
1727#include <string.h> 1735#include <string.h>
1728#include <float.h> 1736#include <float.h>
1729EOF 1737EOF
1730ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1738ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1731{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1739{ (eval echo configure:1740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1732ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1740ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1733if test -z "$ac_err"; then 1741if test -z "$ac_err"; then
1734 rm -rf conftest* 1742 rm -rf conftest*
1735 ac_cv_header_stdc=yes 1743 ac_cv_header_stdc=yes
1736else 1744else
… …
1743rm -f conftest* 1751rm -f conftest*
1744 1752
1745if test $ac_cv_header_stdc = yes; then 1753if test $ac_cv_header_stdc = yes; then
1746 # SunOS 4.x string.h does not declare mem*, contrary to ANSI. 1754 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
1747cat > conftest.$ac_ext <<EOF 1755cat > conftest.$ac_ext <<EOF
1748#line 1749 "configure" 1756#line 1757 "configure"
1749#include "confdefs.h" 1757#include "confdefs.h"
1750#include <string.h> 1758#include <string.h>
1751EOF 1759EOF
1752if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 1760if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1753 egrep "memchr" >/dev/null 2>&1; then 1761 egrep "memchr" >/dev/null 2>&1; then
… …
1761fi 1769fi
1762 1770
1763if test $ac_cv_header_stdc = yes; then 1771if test $ac_cv_header_stdc = yes; then
1764 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. 1772 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
1765cat > conftest.$ac_ext <<EOF 1773cat > conftest.$ac_ext <<EOF
1766#line 1767 "configure" 1774#line 1775 "configure"
1767#include "confdefs.h" 1775#include "confdefs.h"
1768#include <stdlib.h> 1776#include <stdlib.h>
1769EOF 1777EOF
1770if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | 1778if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1771 egrep "free" >/dev/null 2>&1; then 1779 egrep "free" >/dev/null 2>&1; then
… …
1782 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. 1790 # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
1783if test "$cross_compiling" = yes; then 1791if test "$cross_compiling" = yes; then
1784 : 1792 :
1785else 1793else
1786 cat > conftest.$ac_ext <<EOF 1794 cat > conftest.$ac_ext <<EOF
1787#line 1788 "configure" 1795#line 1796 "configure"
1788#include "confdefs.h" 1796#include "confdefs.h"
1789#include <ctype.h> 1797#include <ctype.h>
1790#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') 1798#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
1791#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) 1799#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
1792#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) 1800#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
1793int main () { int i; for (i = 0; i < 256; i++) 1801int main () { int i; for (i = 0; i < 256; i++)
1794if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); 1802if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
1795exit (0); } 1803exit (0); }
1796 1804
1797EOF 1805EOF
1798if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 1806if { (eval echo configure:1807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1799then 1807then
1800 : 1808 :
1801else 1809else
1802 echo "configure: failed program was:" >&5 1810 echo "configure: failed program was:" >&5
1803 cat conftest.$ac_ext >&5 1811 cat conftest.$ac_ext >&5
… …
1820 1828
1821for ac_hdr in unistd.h 1829for ac_hdr in unistd.h
1822do 1830do
1823ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` 1831ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
1824echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 1832echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
1825echo "configure:1826: checking for $ac_hdr" >&5 1833echo "configure:1834: checking for $ac_hdr" >&5
1826if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then 1834if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
1827 echo $ac_n "(cached) $ac_c" 1>&6 1835 echo $ac_n "(cached) $ac_c" 1>&6
1828else 1836else
1829 cat > conftest.$ac_ext <<EOF 1837 cat > conftest.$ac_ext <<EOF
1830#line 1831 "configure" 1838#line 1839 "configure"
1831#include "confdefs.h" 1839#include "confdefs.h"
1832#include <$ac_hdr> 1840#include <$ac_hdr>
1833EOF 1841EOF
1834ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" 1842ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
1835{ (eval echo configure:1836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } 1843{ (eval echo configure:1844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
1836ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` 1844ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
1837if test -z "$ac_err"; then 1845if test -z "$ac_err"; then
1838 rm -rf conftest* 1846 rm -rf conftest*
1839 eval "ac_cv_header_$ac_safe=yes" 1847 eval "ac_cv_header_$ac_safe=yes"
1840else 1848else
… …
1858fi 1866fi
1859done 1867done
1860 1868
1861 1869
1862echo $ac_n "checking for working const""... $ac_c" 1>&6 1870echo $ac_n "checking for working const""... $ac_c" 1>&6
1863echo "configure:1864: checking for working const" >&5 1871echo "configure:1872: checking for working const" >&5
1864if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then 1872if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
1865 echo $ac_n "(cached) $ac_c" 1>&6 1873 echo $ac_n "(cached) $ac_c" 1>&6
1866else 1874else
1867 cat > conftest.$ac_ext <<EOF 1875 cat > conftest.$ac_ext <<EOF
1868#line 1869 "configure" 1876#line 1877 "configure"
1869#include "confdefs.h" 1877#include "confdefs.h"
1870 1878
1871int main() { 1879int main() {
1872 1880
1873/* Ultrix mips cc rejects this. */ 1881/* Ultrix mips cc rejects this. */
… …
1912 const int foo = 10; 1920 const int foo = 10;
1913} 1921}
1914 1922
1915; return 0; } 1923; return 0; }
1916EOF 1924EOF
1917if { (eval echo configure:1918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then 1925if { (eval echo configure:1926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
1918 rm -rf conftest* 1926 rm -rf conftest*
1919 ac_cv_c_const=yes 1927 ac_cv_c_const=yes
1920else 1928else
1921 echo "configure: failed program was:" >&5 1929 echo "configure: failed program was:" >&5
1922 cat conftest.$ac_ext >&5 1930 cat conftest.$ac_ext >&5
… …
1933EOF 1941EOF
1934 1942
1935fi 1943fi
1936 1944
1937echo $ac_n "checking for size_t""... $ac_c" 1>&6 1945echo $ac_n "checking for size_t""... $ac_c" 1>&6
1938echo "configure:1939: checking for size_t" >&5 1946echo "configure:1947: checking for size_t" >&5
1939if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then 1947if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
1940 echo $ac_n "(cached) $ac_c" 1>&6 1948 echo $ac_n "(cached) $ac_c" 1>&6
1941else 1949else
1942 cat > conftest.$ac_ext <<EOF 1950 cat > conftest.$ac_ext <<EOF
1943#line 1944 "configure" 1951#line 1952 "configure"
1944#include "confdefs.h" 1952#include "confdefs.h"
1945#include <sys/types.h> 1953#include <sys/types.h>
1946#if STDC_HEADERS 1954#if STDC_HEADERS
1947#include <stdlib.h> 1955#include <stdlib.h>
1948#include <stddef.h> 1956#include <stddef.h>
… …
1968fi 1976fi
1969 1977
1970 1978
1971 1979
1972echo $ac_n "checking size of char""... $ac_c" 1>&6 1980echo $ac_n "checking size of char""... $ac_c" 1>&6
1973echo "configure:1974: checking size of char" >&5 1981echo "configure:1982: checking size of char" >&5
1974if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then 1982if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
1975 echo $ac_n "(cached) $ac_c" 1>&6 1983 echo $ac_n "(cached) $ac_c" 1>&6
1976else 1984else
1977 if test "$cross_compiling" = yes; then 1985 if test "$cross_compiling" = yes; then
1978 ac_cv_sizeof_char=1 1986 ac_cv_sizeof_char=1
1979else 1987else
1980 cat > conftest.$ac_ext <<EOF 1988 cat > conftest.$ac_ext <<EOF
1981#line 1982 "configure" 1989#line 1990 "configure"
1982#include "confdefs.h" 1990#include "confdefs.h"
1983#include <stdio.h> 1991#include <stdio.h>
1984main() 1992main()
1985{ 1993{
1986 FILE *f=fopen("conftestval", "w"); 1994 FILE *f=fopen("conftestval", "w");
1987 if (!f) exit(1); 1995 if (!f) exit(1);
1988 fprintf(f, "%d\n", sizeof(char)); 1996 fprintf(f, "%d\n", sizeof(char));
1989 exit(0); 1997 exit(0);
1990} 1998}
1991EOF 1999EOF
1992if { (eval echo configure:1993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 2000if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
1993then 2001then
1994 ac_cv_sizeof_char=`cat conftestval` 2002 ac_cv_sizeof_char=`cat conftestval`
1995else 2003else
1996 echo "configure: failed program was:" >&5 2004 echo "configure: failed program was:" >&5
1997 cat conftest.$ac_ext >&5 2005 cat conftest.$ac_ext >&5
… …
2007#define SIZEOF_CHAR $ac_cv_sizeof_char 2015#define SIZEOF_CHAR $ac_cv_sizeof_char
2008EOF 2016EOF
2009 2017
2010 2018
2011echo $ac_n "checking size of short""... $ac_c" 1>&6 2019echo $ac_n "checking size of short""... $ac_c" 1>&6
2012echo "configure:2013: checking size of short" >&5 2020echo "configure:2021: checking size of short" >&5
2013if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then 2021if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
2014 echo $ac_n "(cached) $ac_c" 1>&6 2022 echo $ac_n "(cached) $ac_c" 1>&6
2015else 2023else
2016 if test "$cross_compiling" = yes; then 2024 if test "$cross_compiling" = yes; then
2017 ac_cv_sizeof_short=1 2025 ac_cv_sizeof_short=1
2018else 2026else
2019 cat > conftest.$ac_ext <<EOF 2027 cat > conftest.$ac_ext <<EOF
2020#line 2021 "configure" 2028#line 2029 "configure"
2021#include "confdefs.h" 2029#include "confdefs.h"
2022#include <stdio.h> 2030#include <stdio.h>
2023main() 2031main()
2024{ 2032{
2025 FILE *f=fopen("conftestval", "w"); 2033 FILE *f=fopen("conftestval", "w");
2026 if (!f) exit(1); 2034 if (!f) exit(1);
2027 fprintf(f, "%d\n", sizeof(short)); 2035 fprintf(f, "%d\n", sizeof(short));
2028 exit(0); 2036 exit(0);
2029} 2037}
2030EOF 2038EOF
2031if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 2039if { (eval echo configure:2040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2032then 2040then
2033 ac_cv_sizeof_short=`cat conftestval` 2041 ac_cv_sizeof_short=`cat conftestval`
2034else 2042else
2035 echo "configure: failed program was:" >&5 2043 echo "configure: failed program was:" >&5
2036 cat conftest.$ac_ext >&5 2044 cat conftest.$ac_ext >&5
… …
2046#define SIZEOF_SHORT $ac_cv_sizeof_short 2054#define SIZEOF_SHORT $ac_cv_sizeof_short
2047EOF 2055EOF
2048 2056
2049 2057
2050echo $ac_n "checking size of int""... $ac_c" 1>&6 2058echo $ac_n "checking size of int""... $ac_c" 1>&6
2051echo "configure:2052: checking size of int" >&5 2059echo "configure:2060: checking size of int" >&5
2052if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then 2060if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
2053 echo $ac_n "(cached) $ac_c" 1>&6 2061 echo $ac_n "(cached) $ac_c" 1>&6
2054else 2062else
2055 if test "$cross_compiling" = yes; then 2063 if test "$cross_compiling" = yes; then
2056 ac_cv_sizeof_int=2 2064 ac_cv_sizeof_int=2
2057else 2065else
2058 cat > conftest.$ac_ext <<EOF 2066 cat > conftest.$ac_ext <<EOF
2059#line 2060 "configure" 2067#line 2068 "configure"
2060#include "confdefs.h" 2068#include "confdefs.h"
2061#include <stdio.h> 2069#include <stdio.h>
2062main() 2070main()
2063{ 2071{
2064 FILE *f=fopen("conftestval", "w"); 2072 FILE *f=fopen("conftestval", "w");
2065 if (!f) exit(1); 2073 if (!f) exit(1);
2066 fprintf(f, "%d\n", sizeof(int)); 2074 fprintf(f, "%d\n", sizeof(int));
2067 exit(0); 2075 exit(0);
2068} 2076}
2069EOF 2077EOF
2070if { (eval echo configure:2071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 2078if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2071then 2079then
2072 ac_cv_sizeof_int=`cat conftestval` 2080 ac_cv_sizeof_int=`cat conftestval`
2073else 2081else
2074 echo "configure: failed program was:" >&5 2082 echo "configure: failed program was:" >&5
2075 cat conftest.$ac_ext >&5 2083 cat conftest.$ac_ext >&5
… …
2085#define SIZEOF_INT $ac_cv_sizeof_int 2093#define SIZEOF_INT $ac_cv_sizeof_int
2086EOF 2094EOF
2087 2095
2088 2096
2089echo $ac_n "checking size of long""... $ac_c" 1>&6 2097echo $ac_n "checking size of long""... $ac_c" 1>&6
2090echo "configure:2091: checking size of long" >&5 2098echo "configure:2099: checking size of long" >&5
2091if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then 2099if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
2092 echo $ac_n "(cached) $ac_c" 1>&6 2100 echo $ac_n "(cached) $ac_c" 1>&6
2093else 2101else
2094 if test "$cross_compiling" = yes; then 2102 if test "$cross_compiling" = yes; then
2095 ac_cv_sizeof_long=4 2103 ac_cv_sizeof_long=4
2096else 2104else
2097 cat > conftest.$ac_ext <<EOF 2105 cat > conftest.$ac_ext <<EOF
2098#line 2099 "configure" 2106#line 2107 "configure"
2099#include "confdefs.h" 2107#include "confdefs.h"
2100#include <stdio.h> 2108#include <stdio.h>
2101main() 2109main()
2102{ 2110{
2103 FILE *f=fopen("conftestval", "w"); 2111 FILE *f=fopen("conftestval", "w");
2104 if (!f) exit(1); 2112 if (!f) exit(1);
2105 fprintf(f, "%d\n", sizeof(long)); 2113 fprintf(f, "%d\n", sizeof(long));
2106 exit(0); 2114 exit(0);
2107} 2115}
2108EOF 2116EOF
2109if { (eval echo configure:2110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 2117if { (eval echo configure:2118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
2110then 2118then
2111 ac_cv_sizeof_long=`cat conftestval` 2119 ac_cv_sizeof_long=`cat conftestval`
2112else 2120else
2113 echo "configure: failed program was:" >&5 2121 echo "configure: failed program was:" >&5
2114 cat conftest.$ac_ext >&5 2122 cat conftest.$ac_ext >&5
… …
2125EOF 2133EOF
2126 2134
2127 2135
2128 2136
2129echo $ac_n "checking for an 8 bit integer type""... $ac_c" 1>&6 2137echo $ac_n "checking for an 8 bit integer type""... $ac_c" 1>&6
2130echo "configure:2131: checking for an 8 bit integer type" >&5 2138echo "configure:2139: checking for an 8 bit integer type" >&5
2131if test $ac_cv_sizeof_char -ge 1 ; then 2139if test $ac_cv_sizeof_char -ge 1 ; then
2132 INT_8_BIT=char 2140 INT_8_BIT=char
2133 echo "$ac_t""char" 1>&6 2141 echo "$ac_t""char" 1>&6
2134elif test $ac_cv_sizeof_short -ge 1 ; then 2142elif test $ac_cv_sizeof_short -ge 1 ; then
2135 INT_8_BIT=short 2143 INT_8_BIT=short
… …
2143else 2151else
2144 { echo "configure: error: No integer type of at least 8 bits found" 1>&2; exit 1; } 2152 { echo "configure: error: No integer type of at least 8 bits found" 1>&2; exit 1; }
2145fi 2153fi
2146 2154
2147echo $ac_n "checking for a 16 bit integer type""... $ac_c" 1>&6 2155echo $ac_n "checking for a 16 bit integer type""... $ac_c" 1>&6
2148echo "configure:2149: checking for a 16 bit integer type" >&5 2156echo "configure:2157: checking for a 16 bit integer type" >&5
2149if test $ac_cv_sizeof_char -ge 2 ; then 2157if test $ac_cv_sizeof_char -ge 2 ; then
2150 INT_16_BIT=char 2158 INT_16_BIT=char
2151 echo "$ac_t""char" 1>&6 2159 echo "$ac_t""char" 1>&6
2152elif test $ac_cv_sizeof_short -ge 2 ; then 2160elif test $ac_cv_sizeof_short -ge 2 ; then
2153 INT_16_BIT=short 2161 INT_16_BIT=short
… …
2161else 2169else
2162 { echo "configure: error: No integer type of at least 16 bits found" 1>&2; exit 1; } 2170 { echo "configure: error: No integer type of at least 16 bits found" 1>&2; exit 1; }
2163fi 2171fi
2164 2172
2165echo $ac_n "checking for a 32 bit integer type""... $ac_c" 1>&6 2173echo $ac_n "checking for a 32 bit integer type""... $ac_c" 1>&6
2166echo "configure:2167: checking for a 32 bit integer type" >&5 2174echo "configure:2175: checking for a 32 bit integer type" >&5
2167if test $ac_cv_sizeof_char -ge 4 ; then 2175if test $ac_cv_sizeof_char -ge 4 ; then
2168 INT_32_BIT=char 2176 INT_32_BIT=char
2169 echo "$ac_t""char" 1>&6 2177 echo "$ac_t""char" 1>&6
2170elif test $ac_cv_sizeof_short -ge 4 ; then 2178elif test $ac_cv_sizeof_short -ge 4 ; then
2171 INT_32_BIT=short 2179 INT_32_BIT=short
… …
2183 2191
2184 2192
2185 2193
2186 2194
2187echo $ac_n "checking for vprintf""... $ac_c" 1>&6 2195echo $ac_n "checking for vprintf""... $ac_c" 1>&6
2188echo "configure:2189: checking for vprintf" >&5 2196echo "configure:2197: checking for vprintf" >&5
2189if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then 2197if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
2190 echo $ac_n "(cached) $ac_c" 1>&6 2198 echo $ac_n "(cached) $ac_c" 1>&6
2191else 2199else
2192 cat > conftest.$ac_ext <<EOF 2200 cat > conftest.$ac_ext <<EOF
2193#line 2194 "configure" 2201#line 2202 "configure"
2194#include "confdefs.h" 2202#include "confdefs.h"
2195/* System header to define __stub macros and hopefully few prototypes, 2203/* System header to define __stub macros and hopefully few prototypes,
2196 which can conflict with char vprintf(); below. */ 2204 which can conflict with char vprintf(); below. */
2197#include <assert.h> 2205#include <assert.h>
2198/* Override any gcc2 internal prototype to avoid an error. */ 2206/* Override any gcc2 internal prototype to avoid an error. */
… …
2211vprintf(); 2219vprintf();
2212#endif 2220#endif
2213 2221
2214; return 0; } 2222; return 0; }
2215EOF 2223EOF
2216if { (eval echo configure:2217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2224if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2217 rm -rf conftest* 2225 rm -rf conftest*
2218 eval "ac_cv_func_vprintf=yes" 2226 eval "ac_cv_func_vprintf=yes"
2219else 2227else
2220 echo "configure: failed program was:" >&5 2228 echo "configure: failed program was:" >&5
2221 cat conftest.$ac_ext >&5 2229 cat conftest.$ac_ext >&5
… …
2235 echo "$ac_t""no" 1>&6 2243 echo "$ac_t""no" 1>&6
2236fi 2244fi
2237 2245
2238if test "$ac_cv_func_vprintf" != yes; then 2246if test "$ac_cv_func_vprintf" != yes; then
2239echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 2247echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
2240echo "configure:2241: checking for _doprnt" >&5 2248echo "configure:2249: checking for _doprnt" >&5
2241if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then 2249if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
2242 echo $ac_n "(cached) $ac_c" 1>&6 2250 echo $ac_n "(cached) $ac_c" 1>&6
2243else 2251else
2244 cat > conftest.$ac_ext <<EOF 2252 cat > conftest.$ac_ext <<EOF
2245#line 2246 "configure" 2253#line 2254 "configure"
2246#include "confdefs.h" 2254#include "confdefs.h"
2247/* System header to define __stub macros and hopefully few prototypes, 2255/* System header to define __stub macros and hopefully few prototypes,
2248 which can conflict with char _doprnt(); below. */ 2256 which can conflict with char _doprnt(); below. */
2249#include <assert.h> 2257#include <assert.h>
2250/* Override any gcc2 internal prototype to avoid an error. */ 2258/* Override any gcc2 internal prototype to avoid an error. */
… …
2263_doprnt(); 2271_doprnt();
2264#endif 2272#endif
2265 2273
2266; return 0; } 2274; return 0; }
2267EOF 2275EOF
2268if { (eval echo configure:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2276if { (eval echo configure:2277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2269 rm -rf conftest* 2277 rm -rf conftest*
2270 eval "ac_cv_func__doprnt=yes" 2278 eval "ac_cv_func__doprnt=yes"
2271else 2279else
2272 echo "configure: failed program was:" >&5 2280 echo "configure: failed program was:" >&5
2273 cat conftest.$ac_ext >&5 2281 cat conftest.$ac_ext >&5
… …
2290fi 2298fi
2291 2299
2292for ac_func in strdup 2300for ac_func in strdup
2293do 2301do
2294echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 2302echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2295echo "configure:2296: checking for $ac_func" >&5 2303echo "configure:2304: checking for $ac_func" >&5
2296if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 2304if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2297 echo $ac_n "(cached) $ac_c" 1>&6 2305 echo $ac_n "(cached) $ac_c" 1>&6
2298else 2306else
2299 cat > conftest.$ac_ext <<EOF 2307 cat > conftest.$ac_ext <<EOF
2300#line 2301 "configure" 2308#line 2309 "configure"
2301#include "confdefs.h" 2309#include "confdefs.h"
2302/* System header to define __stub macros and hopefully few prototypes, 2310/* System header to define __stub macros and hopefully few prototypes,
2303 which can conflict with char $ac_func(); below. */ 2311 which can conflict with char $ac_func(); below. */
2304#include <assert.h> 2312#include <assert.h>
2305/* Override any gcc2 internal prototype to avoid an error. */ 2313/* Override any gcc2 internal prototype to avoid an error. */
… …
2318$ac_func(); 2326$ac_func();
2319#endif 2327#endif
2320 2328
2321; return 0; } 2329; return 0; }
2322EOF 2330EOF
2323if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2331if { (eval echo configure:2332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2324 rm -rf conftest* 2332 rm -rf conftest*
2325 eval "ac_cv_func_$ac_func=yes" 2333 eval "ac_cv_func_$ac_func=yes"
2326else 2334else
2327 echo "configure: failed program was:" >&5 2335 echo "configure: failed program was:" >&5
2328 cat conftest.$ac_ext >&5 2336 cat conftest.$ac_ext >&5
… …
2347 2355
2348 2356
2349for ac_func in getopt_long 2357for ac_func in getopt_long
2350do 2358do
2351echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 2359echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
2352echo "configure:2353: checking for $ac_func" >&5 2360echo "configure:2361: checking for $ac_func" >&5
2353if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then 2361if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
2354 echo $ac_n "(cached) $ac_c" 1>&6 2362 echo $ac_n "(cached) $ac_c" 1>&6
2355else 2363else
2356 cat > conftest.$ac_ext <<EOF 2364 cat > conftest.$ac_ext <<EOF
2357#line 2358 "configure" 2365#line 2366 "configure"
2358#include "confdefs.h" 2366#include "confdefs.h"
2359/* System header to define __stub macros and hopefully few prototypes, 2367/* System header to define __stub macros and hopefully few prototypes,
2360 which can conflict with char $ac_func(); below. */ 2368 which can conflict with char $ac_func(); below. */
2361#include <assert.h> 2369#include <assert.h>
2362/* Override any gcc2 internal prototype to avoid an error. */ 2370/* Override any gcc2 internal prototype to avoid an error. */
… …
2375$ac_func(); 2383$ac_func();
2376#endif 2384#endif
2377 2385
2378; return 0; } 2386; return 0; }
2379EOF 2387EOF
2380if { (eval echo configure:2381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 2388if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2381 rm -rf conftest* 2389 rm -rf conftest*
2382 eval "ac_cv_func_$ac_func=yes" 2390 eval "ac_cv_func_$ac_func=yes"
2383else 2391else
2384 echo "configure: failed program was:" >&5 2392 echo "configure: failed program was:" >&5
2385 cat conftest.$ac_ext >&5 2393 cat conftest.$ac_ext >&5
… …
2396#define $ac_tr_func 1 2404#define $ac_tr_func 1
2397EOF 2405EOF
2398 2406
2399else 2407else
2400 echo "$ac_t""no" 1>&6 2408 echo "$ac_t""no" 1>&6
2401LIBOBJS="$LIBOBJS getopt.o getopt1.o" 2409LIBOBJS="$LIBOBJS getopt.lo getopt1.lo"
2402fi 2410fi
2403done 2411done
2404 2412
2405 2413
2406 2414
… …
2592done 2600done
2593 2601
2594ac_given_srcdir=$srcdir 2602ac_given_srcdir=$srcdir
2595ac_given_INSTALL="$INSTALL" 2603ac_given_INSTALL="$INSTALL"
2596 2604
2597trap '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 extra/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
2598EOF 2606EOF
2599cat >> $CONFIG_STATUS <<EOF 2607cat >> $CONFIG_STATUS <<EOF
2600 2608
2601# 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.
2602sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; 2610sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
… …
2650s%@RANLIB@%$RANLIB%g 2658s%@RANLIB@%$RANLIB%g
2651s%@CC@%$CC%g 2659s%@CC@%$CC%g
2652s%@LN_S@%$LN_S%g 2660s%@LN_S@%$LN_S%g
2653s%@LIBTOOL@%$LIBTOOL%g 2661s%@LIBTOOL@%$LIBTOOL%g
2654s%@cflags_set@%$cflags_set%g 2662s%@cflags_set@%$cflags_set%g
2663s%@IMAGEMAGICK@%$IMAGEMAGICK%g
2655s%@LIB_MAGICK@%$LIB_MAGICK%g 2664s%@LIB_MAGICK@%$LIB_MAGICK%g
2656s%@CPP@%$CPP%g 2665s%@CPP@%$CPP%g
2657s%@INT_8_BIT@%$INT_8_BIT%g 2666s%@INT_8_BIT@%$INT_8_BIT%g
2658s%@INT_16_BIT@%$INT_16_BIT%g 2667s%@INT_16_BIT@%$INT_16_BIT%g
2659s%@INT_32_BIT@%$INT_32_BIT%g 2668s%@INT_32_BIT@%$INT_32_BIT%g
… …
2705fi 2714fi
2706EOF 2715EOF
2707 2716
2708cat >> $CONFIG_STATUS <<EOF 2717cat >> $CONFIG_STATUS <<EOF
2709 2718
2710CONFIG_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 extra/Makefile"}
2711EOF 2720EOF
2712cat >> $CONFIG_STATUS <<\EOF 2721cat >> $CONFIG_STATUS <<\EOF
2713for 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
2714 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". 2723 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
2715 case "$ac_file" in 2724 case "$ac_file" in
Legend:
Removed from v.50  
changed lines
  Added in v.97
frodo@frodo.looijaard.name
 ViewVC Help
Powered by ViewVC 1.1.26