Index: kit/README.fonts diff -u kit/README.fonts:1.20 kit/README.fonts:1.21 --- kit/README.fonts:1.20 Fri Apr 23 17:35:52 1999 +++ kit/README.fonts Mon May 24 00:28:59 1999 @@ -1,6 +1,6 @@ Configuring fonts for MagicPoint presentation -$Id: README.fonts,v 1.20 1999/04/23 08:35:52 itojun Exp $ +$Id: README.fonts,v 1.21 1999/05/23 15:28:59 nishida Exp $ For better presentation with "MagicPoint" presentation tool, it is necessary to configure your MagicPoint, and maybe your X11 server to @@ -69,12 +69,17 @@ Japanese font files. Japanese font file includes several thousand of letters and will occupies several megabytes on your disk. -Combination of FreeType and VFlib +Scalable Japanese fonts, with FreeType --------------------------------- -MagicPoint uses FreeType only for rendering English fonts, and uses -VFlib only for rendering Japanese fonts, at this moment. Therefore, -it would be the best for Japanese people to link BOTH FreeType and -VFlib into MagicPoint binary. +Recent MagicPoint can use FreeType library for rendering Japanese fonts. +You can use this function to execute configure script, as below: + + ./configure --enable-freetype-charset16 + +If you have already installed VFlib library and you want to use FreeType +library to render Japanese fonts, you have to disable vflib, as below: + + ./configure --disable-vflib --enable-freetype-charset16 Advanced/complex methods Index: kit/README.fonts.jp diff -u kit/README.fonts.jp:1.10 kit/README.fonts.jp:1.11 --- kit/README.fonts.jp:1.10 Fri Apr 23 17:35:54 1999 +++ kit/README.fonts.jp Mon May 24 00:29:01 1999 @@ -1,6 +1,6 @@ MagicPointプレゼンテーション用のフォント設定について -$Id: README.fonts.jp,v 1.10 1999/04/23 08:35:54 itojun Exp $ +$Id: README.fonts.jp,v 1.11 1999/05/23 15:29:01 nishida Exp $ -----日本語版(README.fonts.jp)に関する注意----- 英語版(README.fonts)の方が正式です。 @@ -33,9 +33,6 @@ のように、configureスクリプトの引数に--disable-freetypeをつけて実行し てください。 -注意：現在 FreeType ライブラリを直接利用する方法では、英文字フォントし -か利用できません。近日中には、日本語フォントもサポートする予定です。 - TrueType フォント(フリー/商用)の取得方法は、『TrueType フォントの取得 方法』を参照してください。 @@ -94,11 +91,24 @@ 日本語のスケーラブル・フォントを利用しても英文字を美しく出力できますが、 日本語のフォントは数千文字のフォントを含んでいる関係上とても大きいので、 英語しか利用しないユーザにとってはちょっと無駄かもしれません。 + +[FreeTypeの利用] + +現在のMagicPointではFreeType(http://www.freetype.org/)を利用して TrueType +の日本語を表示することができます。FreeTypeがインストールされている +環境で、 + + ./configure --enable-freetype-charset16 + +のようにオプションを指定してconfigureを実行してください。 + +(*注) VFlibがインストールされている環境で、FreeTypeを利用して日本語フォント +を表示したい場合は、configure スクリプトの実行時に -[VFlibとFreeTypeの複合利用] + ./configure --disable-vflib --enable-freetype-charset16 -現時点では、MagicPoint では FreeType は英文字フォントのみに、VFlib は -日本語フォントのみに利用するようになっています。 +のようにオプションで--disable-vflibを指定して、VFlibをリンクしないように +して下さい。 合わせ技 Index: kit/configure diff -u kit/configure:1.57 kit/configure:1.59 --- kit/configure:1.57 Sun May 16 01:15:56 1999 +++ kit/configure Mon May 24 00:56:27 1999 @@ -1022,9 +1022,13 @@ for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr; do ac_cv_ft_lib=no ac_cv_ft_include=no - if test -d $dir/lib -a -f "$dir/lib/libttf.so*"; then + shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` + if test x$shlib1 = x; then + $shlib1=no + fi + if test -d $dir/lib -a -f $dir/lib/$shlib1; then ac_cv_ft_lib="$dir/lib" - ac_cv_ft_libpath=`ls $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` + ac_cv_ft_libpath=`ls $dir/lib/$shlib1` elif test -d $dir/lib -a -f $dir/lib/libttf.a; then ac_cv_ft_lib="$dir/lib" ac_cv_ft_libpath="libttf.a" @@ -1050,7 +1054,7 @@ OPTFLAGS="-I$ac_cv_ft_include $OPTFLAGS" DEPLIBS="$ac_cv_ft_lib/$ac_cv_ft_libpath $DEPLIBS" echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:1054: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:1058: 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 @@ -1058,7 +1062,7 @@ ac_save_LIBS="$LIBS" LIBS="-lttf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1077: \"$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 @@ -1099,14 +1103,14 @@ fi cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1121,16 +1125,16 @@ EOF echo $ac_n "checking for num_CharMaps field in TT_Face_Properties""... $ac_c" 1>&6 -echo "configure:1125: checking for num_CharMaps field in TT_Face_Properties" >&5 +echo "configure:1129: 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:1134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1138: \"$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 @@ -1147,7 +1151,7 @@ fi echo $ac_n "checking if --disable-vflib option specified""... $ac_c" 1>&6 -echo "configure:1151: checking if --disable-vflib option specified" >&5 +echo "configure:1155: 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" @@ -1160,21 +1164,29 @@ if test "$mgp_use_vflib" = "yes"; then echo $ac_n "checking for VFlib library/header""... $ac_c" 1>&6 -echo "configure:1164: checking for VFlib library/header" >&5 +echo "configure:1168: checking for VFlib library/header" >&5 for dir in /usr/local/VFlib /usr/local/vflib /usr/local /usr/pkg; do ac_cv_vf_libname=VFlib ac_cv_vf_libdir=no ac_cv_vf_hdrdir=no - if test -d $dir/lib -a -f $dir/lib/libVFlib.so; then + shlib1=`echo $dir/lib/libVFlib.so* | head -1 | sed -e 's/.*\///'` + shlib2=`echo $dir/lib/libVFlib2.so* | head -1 | sed -e 's/.*\///'` + if test x$shlib1 = x; then + $shlib1=no + fi + if test x$shlib2 = x; then + $shlib2=no + fi + if test -d $dir/lib -a -f $dir/lib/$shlib1; then ac_cv_vf_libdir="$dir/lib" - ac_cv_vf_libpath="libVFlib.so" + ac_cv_vf_libpath=$shlib1 elif test -d $dir/lib -a -f $dir/lib/libVFlib.a; then ac_cv_vf_libdir="$dir/lib" ac_cv_vf_libpath="libVFlib.a" - elif test -d $dir/lib -a -f $dir/lib/libVFlib2.so; then + elif test -d $dir/lib -a -f $dir/lib/$shlib2; then ac_cv_vf_libname=VFlib2 ac_cv_vf_libdir="$dir/lib" - ac_cv_vf_libpath="libVFlib2.so" + ac_cv_vf_libpath=$shlib2 elif test -d $dir/lib -a -f $dir/lib/libVFlib2.a; then ac_cv_vf_libname=VFlib2 ac_cv_vf_libdir="$dir/lib" @@ -1201,7 +1213,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:1205: checking for VF_Init in -l$ac_cv_vf_libname" >&5 +echo "configure:1217: 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 @@ -1209,7 +1221,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:1236: \"$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 @@ -1243,14 +1255,14 @@ fi cat > conftest.$ac_ext < int main() { ; return 0; } EOF -if { (eval echo configure:1254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1266,7 +1278,7 @@ echo $ac_n "checking for VFlib configuration file""... $ac_c" 1>&6 -echo "configure:1270: checking for VFlib configuration file" >&5 +echo "configure:1282: 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" @@ -1304,7 +1316,7 @@ if test "$mgp_use_freetype" = "yes"; then echo $ac_n "checking if --enable-freetype-charset16 option specified""... $ac_c" 1>&6 -echo "configure:1308: checking if --enable-freetype-charset16 option specified" >&5 +echo "configure:1320: 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" @@ -1324,7 +1336,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1328: checking how to run the C preprocessor" >&5 +echo "configure:1340: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1339,13 +1351,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1361: \"$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 : @@ -1356,13 +1368,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1378: \"$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 : @@ -1373,13 +1385,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1395: \"$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 : @@ -1408,7 +1420,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:1412: checking for X" >&5 +echo "configure:1424: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -1470,12 +1482,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:1479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1491: \"$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* @@ -1544,14 +1556,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:1567: \"$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. @@ -1638,12 +1650,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1642: checking for ANSI C header files" >&5 +echo "configure:1654: 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 @@ -1651,7 +1663,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1667: \"$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* @@ -1668,7 +1680,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 @@ -1686,7 +1698,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 @@ -1707,7 +1719,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1718,7 +1730,7 @@ exit (0); } EOF -if { (eval echo configure:1722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1742,12 +1754,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1746: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1758: 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 @@ -1763,7 +1775,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1787,17 +1799,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1791: checking for $ac_hdr" >&5 +echo "configure:1803: 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:1801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1813: \"$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* @@ -1825,12 +1837,12 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1829: checking for working const" >&5 +echo "configure:1841: 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:1895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1900,21 +1912,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1904: checking for inline" >&5 +echo "configure:1916: 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:1930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1940,12 +1952,12 @@ esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:1944: checking for pid_t" >&5 +echo "configure:1956: 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 @@ -1973,12 +1985,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1977: checking for size_t" >&5 +echo "configure:1989: 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 @@ -2006,12 +2018,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2010: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2022: 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 @@ -2020,7 +2032,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2041,12 +2053,12 @@ fi echo $ac_n "checking for u_int""... $ac_c" 1>&6 -echo "configure:2045: checking for u_int" >&5 +echo "configure:2057: 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 @@ -2074,12 +2086,12 @@ fi echo $ac_n "checking for u_char""... $ac_c" 1>&6 -echo "configure:2078: checking for u_char" >&5 +echo "configure:2090: 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 @@ -2108,7 +2120,7 @@ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2112: checking for 8-bit clean memcmp" >&5 +echo "configure:2124: 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 @@ -2116,7 +2128,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:2142: \"$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 @@ -2144,12 +2156,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:2148: checking return type of signal handlers" >&5 +echo "configure:2160: 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 @@ -2166,7 +2178,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2187,12 +2199,12 @@ for ac_func in poll strstr _setbufend do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2191: checking for $ac_func" >&5 +echo "configure:2203: 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:2231: \"$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 @@ -2242,12 +2254,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:2246: checking for $ac_func" >&5 +echo "configure:2258: 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:2286: \"$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.54 kit/configure.in:1.56 --- kit/configure.in:1.54 Sun May 16 01:15:58 1999 +++ kit/configure.in Mon May 24 00:56:29 1999 @@ -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.54 1999/05/15 16:15:58 nishida Exp $ +dnl $Id: configure.in,v 1.56 1999/05/23 15:56:29 nishida Exp $ AC_INIT(image/imagetypes.c) dnl Checks for programs. @@ -68,9 +68,13 @@ for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr; do ac_cv_ft_lib=no ac_cv_ft_include=no - if test -d $dir/lib -a -f "$dir/lib/libttf.so*"; then + shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` + if test x$shlib1 = x; then + $shlib1=no + fi + if test -d $dir/lib -a -f $dir/lib/$shlib1; then ac_cv_ft_lib="$dir/lib" - ac_cv_ft_libpath=`ls $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` + ac_cv_ft_libpath=`ls $dir/lib/$shlib1` elif test -d $dir/lib -a -f $dir/lib/libttf.a; then ac_cv_ft_lib="$dir/lib" ac_cv_ft_libpath="libttf.a" @@ -123,16 +127,24 @@ ac_cv_vf_libname=VFlib ac_cv_vf_libdir=no ac_cv_vf_hdrdir=no - if test -d $dir/lib -a -f $dir/lib/libVFlib.so; then + shlib1=`echo $dir/lib/libVFlib.so* | head -1 | sed -e 's/.*\///'` + shlib2=`echo $dir/lib/libVFlib2.so* | head -1 | sed -e 's/.*\///'` + if test x$shlib1 = x; then + $shlib1=no + fi + if test x$shlib2 = x; then + $shlib2=no + fi + if test -d $dir/lib -a -f $dir/lib/$shlib1; then ac_cv_vf_libdir="$dir/lib" - ac_cv_vf_libpath="libVFlib.so" + ac_cv_vf_libpath=$shlib1 elif test -d $dir/lib -a -f $dir/lib/libVFlib.a; then ac_cv_vf_libdir="$dir/lib" ac_cv_vf_libpath="libVFlib.a" - elif test -d $dir/lib -a -f $dir/lib/libVFlib2.so; then + elif test -d $dir/lib -a -f $dir/lib/$shlib2; then ac_cv_vf_libname=VFlib2 ac_cv_vf_libdir="$dir/lib" - ac_cv_vf_libpath="libVFlib2.so" + ac_cv_vf_libpath=$shlib2 elif test -d $dir/lib -a -f $dir/lib/libVFlib2.a; then ac_cv_vf_libname=VFlib2 ac_cv_vf_libdir="$dir/lib" 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 May 24 05:10:09 1999 @@ -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/keywords.pl diff -u kit/keywords.pl:1.1 kit/keywords.pl:removed --- kit/keywords.pl:1.1 Tue Nov 11 15:07:40 1997 +++ kit/keywords.pl Mon May 24 05:10:10 1999 @@ -1,14 +0,0 @@ -@keywords = (); - -die if (@ARGV != 1); -open(IN, "< $ARGV[0]") || die; -while () { - next if (! /^\/\*CTL\*\//); - next if (! /CTL_([A-Z0-9]+),/); - $t = $1; - $t =~ tr/A-Z/a-z/; - push(@keywords, $t); -} -close(IN); - -print join(' ', @keywords) . "\n";