From 198ad22677ede977cfdde0655559af4b179bf63f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 16 Jul 2006 17:37:55 +0000 Subject: regenerate configure scripts with ./reautoconf git-svn-id: svn://tug.org/texlive/trunk@1857 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/ttf2pk/configure | 59 ++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 31 deletions(-) (limited to 'Build/source/texk/ttf2pk/configure') diff --git a/Build/source/texk/ttf2pk/configure b/Build/source/texk/ttf2pk/configure index 674a47cc9f8..60740f861a3 100755 --- a/Build/source/texk/ttf2pk/configure +++ b/Build/source/texk/ttf2pk/configure @@ -1045,13 +1045,12 @@ fi echo $ac_n "checking where the main texmf tree is located""... $ac_c" 1>&6 echo "configure:1048: checking where the main texmf tree is located" >&5 +case $prefix in + */) prefix=`echo "$prefix" | sed 's@/*$@@'`;; +esac texmfmain= -if test -n "$TEXMFMAIN"; then - texmfmain="$TEXMFMAIN" - echo "$ac_t""$texmfmain (from TEXMFMAIN)" 1>&6 - -elif test "x$datadir" != 'x${prefix}/share'; then - # datadir is explicitly defined, assume datadir/texmf. +if test "x$datadir" != 'x${prefix}/share'; then + # First case, datadir is defined... eval p=\"$datadir\" # Unconditionally set the directory, but... texmfmain=`echo "$p/texmf" | sed 's,//*,/,g'` @@ -1060,17 +1059,15 @@ elif test "x$datadir" != 'x${prefix}/share'; then echo "$ac_t"""$texmfmain"" 1>&6 else echo "$ac_t""not found" 1>&6 - echo "configure: warning: No texmf tree found at datadir/texmf ($texmfmain)" 1>&2 - echo "configure: warning: proceeding anyway. + echo "configure: warning: No texmf tree found at $texmfmain. ***************************************************************** - * Warning: The main texmf tree was not found. * - * If you do not have the files, you should be able to find them * - * at the same place you got these sources, or from one of the * - * CTAN hosts. Good luck. * + * Error: The main texmf tree was not found. * + * If you do not have the files, you should be able to them from * + * the same place you got these sources from, or from one of the * + * CTAN hosts. * ***************************************************************** -" 1>&2 + Winging it." 1>&2 fi - else # Second case, datadir is default... if test "x$prefix" = "xNONE"; then @@ -1097,7 +1094,7 @@ else echo "$ac_t""not found" 1>&6 echo "configure: warning: The main texmf tree was not found at $texmfmain. ***************************************************************** - * Warning: The main texmf tree was not found. * + * Error: The main texmf tree was not found. * * Use the --datadir option to specify its parent directory. * * If you do not have the files, you should be able to them from * * the same place you got these sources from, or from one of the * @@ -1155,7 +1152,7 @@ else if test "$with_system_freetype" = yes; then echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:1159: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:1156: 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 @@ -1163,7 +1160,7 @@ else 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:1175: \"$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 @@ -1207,7 +1204,7 @@ fi if test "$with_system_freetype" = yes; then echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1211: checking how to run the C preprocessor" >&5 +echo "configure:1208: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1222,13 +1219,13 @@ else # 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:1232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1229: \"$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 : @@ -1239,13 +1236,13 @@ else 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:1249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1246: \"$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 : @@ -1256,13 +1253,13 @@ else 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:1266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1263: \"$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 : @@ -1290,17 +1287,17 @@ for ac_hdr in freetype.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1294: checking for $ac_hdr" >&5 +echo "configure:1291: 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:1304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1301: \"$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* @@ -1355,7 +1352,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:1359: checking for main in -lm" >&5 +echo "configure:1356: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1363,14 +1360,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1371: \"$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 -- cgit v1.2.3