From e2c6d506f11287381e50c4c1dda8009937d8725b Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Fri, 11 Dec 2009 16:09:14 +0000 Subject: build system: fix 'make check' problems on FreeBSD git-svn-id: svn://tug.org/texlive/trunk@16363 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/t1lib/ChangeLog | 6 ++ Build/source/libs/t1lib/configure | 103 ++++++++++++++++++++++++++++++++++ Build/source/libs/t1lib/configure.ac | 2 + Build/source/libs/t1lib/type1afm.test | 4 +- 4 files changed, 113 insertions(+), 2 deletions(-) (limited to 'Build/source/libs/t1lib') diff --git a/Build/source/libs/t1lib/ChangeLog b/Build/source/libs/t1lib/ChangeLog index 5a48bbb0aeb..abdf48e85ca 100644 --- a/Build/source/libs/t1lib/ChangeLog +++ b/Build/source/libs/t1lib/ChangeLog @@ -1,3 +1,9 @@ +2009-12-11 Peter Breitenlohner + + * configure.ac: Check if libm is required for sqrt(). + * type1afm.test: Avoid GNU-ism (sed -e EXPR FILE). + Reported by Nikola Lecic . + 2009-02-05 Peter Breitenlohner Adapt to TL2009 build system. diff --git a/Build/source/libs/t1lib/configure b/Build/source/libs/t1lib/configure index fe98b58118c..768d67fbf94 100755 --- a/Build/source/libs/t1lib/configure +++ b/Build/source/libs/t1lib/configure @@ -1458,6 +1458,52 @@ fi } # ac_fn_c_try_compile +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + # ac_fn_c_try_cpp LINENO # ---------------------- # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -3766,6 +3812,63 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sqrt" >&5 +$as_echo_n "checking for library containing sqrt... " >&6; } +if test "${ac_cv_search_sqrt+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqrt (); +int +main () +{ +return sqrt (); + ; + return 0; +} +_ACEOF +for ac_lib in '' m; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_sqrt=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_sqrt+set}" = set; then : + break +fi +done +if test "${ac_cv_search_sqrt+set}" = set; then : + +else + ac_cv_search_sqrt=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_sqrt" >&5 +$as_echo "$ac_cv_search_sqrt" >&6; } +ac_res=$ac_cv_search_sqrt +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' diff --git a/Build/source/libs/t1lib/configure.ac b/Build/source/libs/t1lib/configure.ac index 7e2ed8199a5..f822a0bc18c 100644 --- a/Build/source/libs/t1lib/configure.ac +++ b/Build/source/libs/t1lib/configure.ac @@ -38,6 +38,8 @@ dnl **** Check for some programs and libraries **** AC_PROG_CC AC_PROG_RANLIB +AC_SEARCH_LIBS([sqrt], [m]) + dnl **** Check for some compiler/system characteristics AC_C_CHAR_UNSIGNED diff --git a/Build/source/libs/t1lib/type1afm.test b/Build/source/libs/t1lib/type1afm.test index 098625ea1f8..30c7e87a476 100755 --- a/Build/source/libs/t1lib/type1afm.test +++ b/Build/source/libs/t1lib/type1afm.test @@ -3,7 +3,7 @@ # Copyright (C) 2009 Peter Breitenlohner # You may freely use, modify and/or distribute this file. -rm -f l047016t.afm +rm -f l047016t.afm x047016t.afm test -f x047016t.pfa \ || cp $srcdir/l047016t.pfa x047016t.pfa \ @@ -11,7 +11,7 @@ test -f x047016t.pfa \ ./type1afm ./x047016t.pfa || exit 1 -sed x047016t.afm -e '/^Comment File creation date:/d' >l047016t.afmx \ +sed -e '/^Comment File creation date:/d' x047016t.afm >l047016t.afmx \ && diff l047016t.afmx $srcdir/l047016t.xafm \ || exit 1 -- cgit v1.2.3