diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-22 18:17:33 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-04-22 18:17:33 +0000 |
commit | 633c2bc993d2ad14ecf137836f22eef08805a3b5 (patch) | |
tree | 784c479c7046d0dbf7cbfb9446c7762b5e1bb494 /Build/source/configure | |
parent | 62b00fcce4ced507597a1c9b18116b781f0d1a9e (diff) |
build fix for freetype2 and macosx (preliminary)
git-svn-id: svn://tug.org/texlive/trunk@12798 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-x | Build/source/configure | 178 |
1 files changed, 120 insertions, 58 deletions
diff --git a/Build/source/configure b/Build/source/configure index 34d2a5cf59f..4b886c4dc5d 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -792,6 +792,7 @@ LIBOBJS subdirs build_kpathsea_FALSE build_kpathsea_TRUE +FT2_CONFIG CXXCPP am__fastdepCXX_FALSE am__fastdepCXX_TRUE @@ -1015,8 +1016,6 @@ with_system_gd with_gd_includes with_gd_libdir with_system_freetype2 -with_freetype2_includes -with_freetype2_libdir with_system_freetype with_freetype_includes with_freetype_libdir @@ -1817,11 +1816,7 @@ Optional Packages: --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR --with-system-freetype2 use installed freetype2 headers and library - --with-freetype2-includes=DIR - freetype2 headers installed in DIR (both -IDIR and - -IDIR/freetype2) - --with-freetype2-libdir=DIR - freetype2 library installed in DIR + (requires freetype-config) --with-system-freetype use installed freetype headers and library --with-freetype-includes=DIR freetype headers installed in DIR @@ -3650,16 +3645,6 @@ test "x$need_gd" = xyes && { if test "${with_system_freetype2+set}" = set; then withval=$with_system_freetype2; fi - -# Check whether --with-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval=$with_freetype2_includes; -fi - -# Check whether --with-freetype2-libdir was given. -if test "${with_freetype2_libdir+set}" = set; then - withval=$with_freetype2_libdir; -fi if test "x$with_system_freetype2" = x; then if test -f $srcdir/libs/freetype2/configure; then { $as_echo "$as_me:$LINENO: Assuming \`freetype2' headers and library from TL tree" >&5 @@ -3682,22 +3667,6 @@ $as_echo "$as_me: Using \`freetype2' headers and library from TL tree" >&6;} ac_configure_args="$ac_configure_args '--without-system-freetype2'" fi fi -if test "x$with_system_freetype2" = xyes; then - if test "x$with_system_zlib" = x; then - { $as_echo "$as_me:$LINENO: -> installed \`zlib' headers and library" >&5 -$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;} - with_system_zlib=yes - ac_configure_args="$ac_configure_args '--with-system-zlib'" - elif test "x$with_system_zlib" != xyes; then - { { $as_echo "$as_me:$LINENO: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&5 -$as_echo "$as_me: error: Sorry, \`--with-system-freetype2' requires \`--with-system-zlib'" >&2;} - { (exit 1); exit 1; }; } - fi -fi - -test "x$need_freetype2" = xyes && { - need_zlib=yes -} ## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/ @@ -5902,13 +5871,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5905: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5874: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5908: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5877: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5911: output\"" >&5) + (eval echo "\"\$as_me:5880: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7114,7 +7083,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7117 "configure"' > conftest.$ac_ext + echo '#line 7086 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9161,11 +9130,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9164: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9133: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9168: \$? = $ac_status" >&5 + echo "$as_me:9137: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9500,11 +9469,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9503: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9472: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9507: \$? = $ac_status" >&5 + echo "$as_me:9476: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9605,11 +9574,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9608: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9577: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9612: \$? = $ac_status" >&5 + echo "$as_me:9581: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9660,11 +9629,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9663: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9632: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9667: \$? = $ac_status" >&5 + echo "$as_me:9636: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12460,7 +12429,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12463 "configure" +#line 12432 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12556,7 +12525,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12559 "configure" +#line 12528 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18952,11 +18921,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18955: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18924: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18959: \$? = $ac_status" >&5 + echo "$as_me:18928: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19051,11 +19020,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19054: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19023: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19058: \$? = $ac_status" >&5 + echo "$as_me:19027: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19103,11 +19072,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19106: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19075: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19110: \$? = $ac_status" >&5 + echo "$as_me:19079: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20137,12 +20106,105 @@ if test "x$with_freetype_libdir" != x && test "x$with_freetype_libdir" != xyes; FREETYPE_LIBS="-L$with_freetype_libdir $FREETYPE_LIBS" fi -if test "x$with_freetype2_includes" != x && test "x$with_freetype2_includes" != xyes; then - FREETYPE2_INCLUDES="-I$with_freetype2_includes/freetype2 -I$with_freetype2_includes" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}freetype-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_FT2_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$FT2_CONFIG"; then + ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi fi -FREETYPE2_LIBS="-lfreetype" -if test "x$with_freetype2_libdir" != x && test "x$with_freetype2_libdir" != xyes; then - FREETYPE2_LIBS="-L$with_freetype2_libdir $FREETYPE2_LIBS" +FT2_CONFIG=$ac_cv_prog_FT2_CONFIG +if test -n "$FT2_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $FT2_CONFIG" >&5 +$as_echo "$FT2_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FT2_CONFIG"; then + ac_ct_FT2_CONFIG=$FT2_CONFIG + # Extract the first word of "freetype-config", so it can be a program name with args. +set dummy freetype-config; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_FT2_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_FT2_CONFIG"; then + ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG +if test -n "$ac_ct_FT2_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_FT2_CONFIG" >&5 +$as_echo "$ac_ct_FT2_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_FT2_CONFIG" = x; then + FT2_CONFIG=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FT2_CONFIG=$ac_ct_FT2_CONFIG + fi +else + FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" +fi + +if test -n `$FT2_CONFIG --ftversion 2>/dev/null`; then + FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` + FREETYPE2_LIBS=`$FT2_CONFIG --libs` +else + { { $as_echo "$as_me:$LINENO: error: Can not use installed freetype2 headers and library" >&5 +$as_echo "$as_me: error: Can not use installed freetype2 headers and library" >&2;} + { (exit 1); exit 1; }; } fi if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then |