Index: kit/CHANGELOG diff -u kit/CHANGELOG:1.9 kit/CHANGELOG:removed --- kit/CHANGELOG:1.9 Sat Sep 5 00:11:21 1998 +++ kit/CHANGELOG Mon Oct 9 05:10:00 2000 @@ -1,51 +0,0 @@ -CHANGELOG for magicpoint -$Id: CHANGELOG,v 1.9 1998/09/04 15:11:21 onoe Exp $ - -Fri Sep 5 1998 onoe@sm.sony.co.jp - * handle key inputs from invoked terminal as pressed on Xserver, - even if the Xserver is running on a remote host. - -Mon Aug 26 1998 itojun@iijlab.net - * new copyright. (BSDish copyright without clause 3) - -Mon Aug 25 1998 itojun@iijlab.net - * print.c: better x11/freetype/vflib -> postscript font mapping. - -Mon Aug 23 1998 kato@wide.ad.jp - * embedded image support (added mgpembed.pl and embed.c) - -Mon Aug 22 1998 itojun@iijlab.net - * added contrib/xmindpath, MindPath PocketPoint user-level driver. - -Fri Jul 10 11:57:59 JST 1998 itojun@iijlab.net - * cache gs-generated image file. - Suggested by: luigi@FreeBSD.org - -Mon Jul 6 11:38:32 JST 1998 itojun@iijlab.net - * capable of handling GB2312 and KSC5601 encoding. - they must be encoded by using iso-2022 like escape sequences. - EUC-cn or EUC-kr does not work. - * -x option is added. - -Thu Jul 2 18:04:16 JST 1998 itojun@iijlab.net - * eliminate gsview. - * revamp "xfont" directive. (see SYNTAX for detail) - -Thu Jun 25 13:10:28 JST 1998 itojun@iijlab.net - * print.c: color postscript support by "mgp2ps -c". - -changes between 1.02a and 1.03a: - * To allow color name that has space inbetween ("dark blue"), - color name after directives SHOULD come with doublequote. - Therefore, - %fore blue - should be - %fore "blue" - At this moment, doublequote can be ommitted for backward - compatibility. We may require to have doublequote in the future. - Font names and other string parameter obeys the same rule. - * %image is now capable of rendering encapsulated postscript files - (*.eps). - %image foo.eps - should work fine. - By using -X option, you can specify device name for ghostscript. Index: kit/FAQ diff -u kit/FAQ:1.2 kit/FAQ:1.3 --- kit/FAQ:1.2 Thu Jun 17 14:21:23 1999 +++ kit/FAQ Sun Oct 8 22:38:47 2000 @@ -1,5 +1,5 @@ MagicPoint FAQ -$Id: FAQ,v 1.2 1999/06/17 05:21:23 kazu Exp $ +$Id: FAQ,v 1.3 2000/10/08 13:38:47 itojun Exp $ Q: When I incorporate postscript in MagicPoint presentation, "ghostscript" @@ -31,3 +31,14 @@ (2) regenerate postscript file, (3) download your font to your printer, (4) try printing the file. + +Q: compilation with png library fails. +A: check the version number of your png library. in most cases, the + library you are using is too old. note that, some of Linux rpms uses + different version numbering scheme from the original png library. + +Q: %system or %xsystem does not work. +Q: if i use %system or %xsystem, X server (or window manager) dies. +A: the behavior of %system/xsystem command heavily depends on the behavior + of your window manager, and they may not work right for some of those. + as there are so many window managers, we have trouble supporting them. Index: kit/configure diff -u kit/configure:1.78 kit/configure:1.79 --- kit/configure:1.78 Tue Jun 20 15:39:11 2000 +++ kit/configure Sun Oct 8 22:49:46 2000 @@ -1137,16 +1137,63 @@ LIBS="-L$ac_cv_ft_lib $LIBS" OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS" DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS" + echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6 +echo "configure:1142: checking for dgettext in -lintl" >&5 +ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:1142: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:1189: checking for TT_Init_FreeType in -lttf" >&5 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lttf $LIBS" +LIBS="-lttf -lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1187,14 +1234,14 @@ fi cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1209,16 +1256,16 @@ EOF echo $ac_n "checking for num_CharMaps field in TT_Face_Properties""... $ac_c" 1>&6 -echo "configure:1213: checking for num_CharMaps field in TT_Face_Properties" >&5 +echo "configure:1260: checking for num_CharMaps field in TT_Face_Properties" >&5 cat > conftest.$ac_ext < int main() { TT_Face_Properties x; return x.num_CharMaps; ; return 0; } EOF -if { (eval echo configure:1222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result=yes; cat >> confdefs.h <<\EOF #define HAVE_TT_FACE_PROPERTIES_CHARMAPS 1 @@ -1235,7 +1282,7 @@ fi echo $ac_n "checking if --disable-vflib option specified""... $ac_c" 1>&6 -echo "configure:1239: checking if --disable-vflib option specified" >&5 +echo "configure:1286: checking if --disable-vflib option specified" >&5 # Check whether --enable-vflib or --disable-vflib was given. if test "${enable_vflib+set}" = set; then enableval="$enable_vflib" @@ -1248,7 +1295,7 @@ if test "$mgp_use_vflib" = "yes"; then echo $ac_n "checking for VFlib library/header""... $ac_c" 1>&6 -echo "configure:1252: checking for VFlib library/header" >&5 +echo "configure:1299: checking for VFlib library/header" >&5 for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg /usr; do ac_cv_vf_libname=VFlib ac_cv_vf_libdir=no @@ -1297,7 +1344,7 @@ OPTFLAGS="-I$ac_cv_vf_hdrdir $OPTFLAGS" DEPLIBS="$ac_cv_vf_libdir/$ac_cv_vf_libpath $DEPLIBS" echo $ac_n "checking for VF_Init in -l$ac_cv_vf_libname""... $ac_c" 1>&6 -echo "configure:1301: checking for VF_Init in -l$ac_cv_vf_libname" >&5 +echo "configure:1348: checking for VF_Init in -l$ac_cv_vf_libname" >&5 ac_lib_var=`echo $ac_cv_vf_libname'_'VF_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1305,7 +1352,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$ac_cv_vf_libname $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1339,14 +1386,14 @@ fi cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1362,7 +1409,7 @@ echo $ac_n "checking for VFlib configuration file""... $ac_c" 1>&6 -echo "configure:1366: checking for VFlib configuration file" >&5 +echo "configure:1413: checking for VFlib configuration file" >&5 # Check whether --with-vfontcap or --without-vfontcap was given. if test "${with_vfontcap+set}" = set; then withval="$with_vfontcap" @@ -1400,7 +1447,7 @@ if test "$mgp_use_freetype" = "yes"; then echo $ac_n "checking if --enable-freetype-charset16 option specified""... $ac_c" 1>&6 -echo "configure:1404: checking if --enable-freetype-charset16 option specified" >&5 +echo "configure:1451: checking if --enable-freetype-charset16 option specified" >&5 # Check whether --enable-freetype-charset16 or --disable-freetype-charset16 was given. if test "${enable_freetype_charset16+set}" = set; then enableval="$enable_freetype_charset16" @@ -1431,7 +1478,7 @@ LIBS="$LIBS -L$i/lib" OPTFLAGS="$OPTFLAGS -I$i/include" echo $ac_n "checking for png_set_tRNS_to_alpha in -lpng""... $ac_c" 1>&6 -echo "configure:1435: checking for png_set_tRNS_to_alpha in -lpng" >&5 +echo "configure:1482: checking for png_set_tRNS_to_alpha in -lpng" >&5 ac_lib_var=`echo png'_'png_set_tRNS_to_alpha | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1439,7 +1486,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1473,7 +1520,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for png_set_gray_1_2_4_to_8 in -lpng""... $ac_c" 1>&6 -echo "configure:1477: checking for png_set_gray_1_2_4_to_8 in -lpng" >&5 +echo "configure:1524: checking for png_set_gray_1_2_4_to_8 in -lpng" >&5 ac_lib_var=`echo png'_'png_set_gray_1_2_4_to_8 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1481,7 +1528,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng -lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1527,7 +1574,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:1531: checking for X" >&5 +echo "configure:1578: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1589,12 +1636,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1663,14 +1710,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -1757,7 +1804,7 @@ fi echo $ac_n "checking if --enable-gif option specified""... $ac_c" 1>&6 -echo "configure:1761: checking if --enable-gif option specified" >&5 +echo "configure:1808: checking if --enable-gif option specified" >&5 # Check whether --enable-gif or --disable-gif was given. if test "${enable_gif+set}" = set; then enableval="$enable_gif" @@ -1769,7 +1816,7 @@ echo "$ac_t""$mgp_gif" 1>&6 if test $mgp_gif = "yes"; then echo $ac_n "checking for DGifOpenFileHandle in -lungif""... $ac_c" 1>&6 -echo "configure:1773: checking for DGifOpenFileHandle in -lungif" >&5 +echo "configure:1820: checking for DGifOpenFileHandle in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileHandle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1777,7 +1824,7 @@ ac_save_LIBS="$LIBS" LIBS="-lungif $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1812,7 +1859,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for DGifOpenFileHandle in -lgif""... $ac_c" 1>&6 -echo "configure:1816: checking for DGifOpenFileHandle in -lgif" >&5 +echo "configure:1863: checking for DGifOpenFileHandle in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileHandle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1820,7 +1867,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgif $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1855,7 +1902,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:1859: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:1906: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1863,7 +1910,7 @@ ac_save_LIBS="$LIBS" LIBS="-lungif -L$x_libraries -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1898,7 +1945,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for DGifOpenFilename in -lgif""... $ac_c" 1>&6 -echo "configure:1902: checking for DGifOpenFilename in -lgif" >&5 +echo "configure:1949: checking for DGifOpenFilename in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFilename | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1906,7 +1953,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgif -L$x_libraries -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1966,12 +2013,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1970: checking for ANSI C header files" >&5 +echo "configure:2017: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1979,7 +2026,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1996,7 +2043,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2014,7 +2061,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -2035,7 +2082,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2046,7 +2093,7 @@ exit (0); } EOF -if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2070,12 +2117,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2074: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2121: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2091,7 +2138,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2115,17 +2162,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2119: checking for $ac_hdr" >&5 +echo "configure:2166: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2153,12 +2200,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2157: checking for working const" >&5 +echo "configure:2204: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2228,21 +2275,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2232: checking for inline" >&5 +echo "configure:2279: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2268,12 +2315,12 @@ esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2272: checking for pid_t" >&5 +echo "configure:2319: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2301,12 +2348,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2305: checking for size_t" >&5 +echo "configure:2352: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2334,12 +2381,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2338: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2385: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2348,7 +2395,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2369,12 +2416,12 @@ fi echo $ac_n "checking for u_int""... $ac_c" 1>&6 -echo "configure:2373: checking for u_int" >&5 +echo "configure:2420: checking for u_int" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2402,12 +2449,12 @@ fi echo $ac_n "checking for u_char""... $ac_c" 1>&6 -echo "configure:2406: checking for u_char" >&5 +echo "configure:2453: checking for u_char" >&5 if eval "test \"`echo '$''{'ac_cv_type_u_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2436,7 +2483,7 @@ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2440: checking for 8-bit clean memcmp" >&5 +echo "configure:2487: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2444,7 +2491,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2472,12 +2519,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2476: checking return type of signal handlers" >&5 +echo "configure:2523: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2494,7 +2541,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2515,12 +2562,12 @@ for ac_func in poll strstr _setbufend do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2519: checking for $ac_func" >&5 +echo "configure:2566: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2570,12 +2617,12 @@ for ac_func in usleep strsep strdup mkstemp snprintf memcmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2574: checking for $ac_func" >&5 +echo "configure:2621: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else Index: kit/configure.in diff -u kit/configure.in:1.75 kit/configure.in:1.76 --- kit/configure.in:1.75 Tue Jun 20 15:39:13 2000 +++ kit/configure.in Sun Oct 8 22:49:46 2000 @@ -3,7 +3,7 @@ dnl independent (using srcdir), however, xmkmf and Imake.tmpl do not dnl allow us to switch compilation directory. dnl -dnl $Id: configure.in,v 1.75 2000/06/20 06:39:13 nishida Exp $ +dnl $Id: configure.in,v 1.76 2000/10/08 13:49:46 itojun Exp $ AC_INIT(image/imagetypes.c) dnl Checks for programs. @@ -102,9 +102,10 @@ LIBS="-L$ac_cv_ft_lib $LIBS" OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS" DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS" + AC_CHECK_LIB(intl, dgettext) AC_CHECK_LIB(ttf, TT_Init_FreeType, [], [echo "Fatal: libttf.a not found" - exit 1]) + exit 1], -lintl) AC_TRY_COMPILE([#include ], [], [], [dnl echo "Fatal: freetype.h not found" exit 1]) Index: kit/ctlwords.pl diff -u kit/ctlwords.pl:1.2 kit/ctlwords.pl:removed --- kit/ctlwords.pl:1.2 Sat Sep 5 06:05:08 1998 +++ kit/ctlwords.pl Mon Oct 9 05:10:01 2000 @@ -1,12 +0,0 @@ -#! /usr/bin/perl -$counter = 0; # 0 origin -print "/* generated by ctlwords.awk. do not edit by hand. */\n"; - -while (<>) { - next if (!/^\/\*CTL\*\//); - next if ($_ !~ /(CTL_[A-Z0-9]+)/); - - $word = $1; - print "#define $word\t$counter\n"; - $counter++; -} Index: kit/image/gif.h diff -u kit/image/gif.h:1.2 kit/image/gif.h:removed --- kit/image/gif.h:1.2 Mon Dec 28 17:23:03 1998 +++ kit/image/gif.h Mon Oct 9 05:10:01 2000 @@ -1,72 +0,0 @@ -/* gif.h: - * - * gifin.h - * kirk johnson - * november 1989 - * external interface to gifin.c - * - * Copyright 1989 Kirk L. Johnson (see the included file - * "kljcpyrght.h" for complete copyright information) - */ - -/* - * gifin return codes - */ -#define GIFIN_SUCCESS 0 /* success */ -#define GIFIN_DONE 1 /* no more images */ - -#define GIFIN_ERR_BAD_SD -1 /* bad screen descriptor */ -#define GIFIN_ERR_BAD_SEP -2 /* bad image separator */ -#define GIFIN_ERR_BAD_SIG -3 /* bad signature */ -#define GIFIN_ERR_EOD -4 /* unexpected end of raster data */ -#define GIFIN_ERR_EOF -5 /* unexpected end of input stream */ -#define GIFIN_ERR_FAO -6 /* file already open */ -#define GIFIN_ERR_IAO -7 /* image already open */ -#define GIFIN_ERR_NFO -8 /* no file open */ -#define GIFIN_ERR_NIO -9 /* no image open */ - -/* - * colormap indices - */ - -#define GIF_RED 0 -#define GIF_GRN 1 -#define GIF_BLU 2 - -/* - * typedef BYTE for convenience - */ - -typedef unsigned char BYTE; - -static int gifin_open_file(); -static int gifin_open_image(); -static int gifin_get_pixel(); -#if 0 -static int gifin_close_image(); -#endif -static int gifin_close_file(); -static int gifin_load_cmap(); -static int gifin_skip_extension(); -static int gifin_read_data_block(); -static int gifin_push_string(); -static void gifin_add_string(); -static void gifin_fatal(); - -/* #defines, typedefs, and such - */ - -#define GIF_SIG "GIF87a" -#define GIF_SIG_89 "GIF89a" -#define GIF_SIG_LEN 6 /* GIF signature length */ -#define GIF_SD_SIZE 7 /* GIF screen descriptor size */ -#define GIF_ID_SIZE 9 /* GIF image descriptor size */ - -#define GIF_SEPARATOR ',' /* GIF image separator */ -#define GIF_EXTENSION '!' /* GIF extension block marker */ -#define GIF_TERMINATOR ';' /* GIF terminator */ - -#define STAB_SIZE 4096 /* string table size */ -#define PSTK_SIZE 4096 /* pixel stack size */ - -#define NULL_CODE -1 /* string table null code */ Index: kit/sample/cloud.gif Index: kit/sample/dad.gif Index: kit/sample/mgp-old1.gif Index: kit/sample/mgp-old2.gif Index: kit/sample/mgp-old3.gif Index: kit/sample/mgp1.gif Index: kit/sample/mgp2.gif Index: kit/sample/mgp3.gif Index: kit/sample/v6header.gif