summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-11 17:34:27 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-01-11 17:34:27 +0000
commitcccf458bc431d5acf57051e42292f42ea20ebb7e (patch)
treee029956c061897544f69d9baad97338ce7849d23 /Build/source/configure
parentb66972550a98f8260ff627d68e9b120ab3e960d1 (diff)
build system: use pkg-config to detect installed libpng
git-svn-id: svn://tug.org/texlive/trunk@21029 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure192
1 files changed, 88 insertions, 104 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 7c66e45cf28..e9c3cbef7be 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -620,8 +620,8 @@ LIBOBJS
cross_compiling_FALSE
cross_compiling_TRUE
ICU_CONFIG
-PKG_CONFIG
FT2_CONFIG
+PKG_CONFIG
DIST_TEXLIBS
TEXLIBS
subdirs
@@ -872,8 +872,6 @@ with_system_t1lib
with_t1lib_includes
with_t1lib_libdir
with_system_libpng
-with_libpng_includes
-with_libpng_libdir
with_system_zlib
with_zlib_includes
with_zlib_libdir
@@ -1720,11 +1718,8 @@ Optional Packages:
--with-t1lib-includes=DIR
t1lib headers installed in DIR
--with-t1lib-libdir=DIR t1lib library installed in DIR
- --with-system-libpng use installed libpng headers and library
- --with-libpng-includes=DIR
- libpng headers installed in DIR
- --with-libpng-libdir=DIR
- libpng library installed in DIR
+ --with-system-libpng use installed libpng headers and library (requires
+ pkg-config)
--with-system-zlib use installed zlib headers and library
--with-zlib-includes=DIR
zlib headers installed in DIR
@@ -5549,16 +5544,6 @@ fi
if test "${with_system_libpng+set}" = set; then :
withval=$with_system_libpng;
fi
-
-# Check whether --with-libpng-includes was given.
-if test "${with_libpng_includes+set}" = set; then :
- withval=$with_libpng_includes;
-fi
-
-# Check whether --with-libpng-libdir was given.
-if test "${with_libpng_libdir+set}" = set; then :
- withval=$with_libpng_libdir;
-fi
if test "x$with_system_libpng" = x; then
if test -f $srcdir/libs/libpng/configure; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`libpng' headers and library from TL tree" >&5
@@ -19569,40 +19554,16 @@ if test "x$with_zlib_libdir" != x && test "x$with_zlib_libdir" != xyes; then
ZLIB_LIBS="-L$with_zlib_libdir $ZLIB_LIBS"
fi
-if test "x$with_libpng_includes" != x && test "x$with_libpng_includes" != xyes; then
- LIBPNG_INCLUDES="-I$with_libpng_includes"
-fi
-LIBPNG_LIBS="-lpng"
-if test "x$with_libpng_libdir" != x && test "x$with_libpng_libdir" != xyes; then
- LIBPNG_LIBS="-L$with_libpng_libdir $LIBPNG_LIBS"
-fi
-
-if test "x$with_t1lib_includes" != x && test "x$with_t1lib_includes" != xyes; then
- T1LIB_INCLUDES="-I$with_t1lib_includes"
-fi
-T1LIB_LIBS="-lt1"
-if test "x$with_t1lib_libdir" != x && test "x$with_t1lib_libdir" != xyes; then
- T1LIB_LIBS="-L$with_t1lib_libdir $T1LIB_LIBS"
-fi
-
-if test "x$with_freetype_includes" != x && test "x$with_freetype_includes" != xyes; then
- FREETYPE_INCLUDES="-I$with_freetype_includes"
-fi
-FREETYPE_LIBS="-lttf"
-if test "x$with_freetype_libdir" != x && test "x$with_freetype_libdir" != xyes; then
- FREETYPE_LIBS="-L$with_freetype_libdir $FREETYPE_LIBS"
-fi
-
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
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_FT2_CONFIG+:} false; then :
+if ${ac_cv_prog_PKG_CONFIG+:} false; 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.
+ if test -n "$PKG_CONFIG"; then
+ ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -19611,7 +19572,7 @@ do
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"
+ ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -19621,10 +19582,10 @@ IFS=$as_save_IFS
fi
fi
-FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
-if test -n "$FT2_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
-$as_echo "$FT2_CONFIG" >&6; }
+PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -19632,17 +19593,17 @@ 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
+if test -z "$ac_cv_prog_PKG_CONFIG"; then
+ ac_ct_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then :
+if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; 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.
+ if test -n "$ac_ct_PKG_CONFIG"; then
+ ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
@@ -19651,7 +19612,7 @@ do
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"
+ ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -19661,17 +19622,17 @@ 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:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
-$as_echo "$ac_ct_FT2_CONFIG" >&6; }
+ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
+if test -n "$ac_ct_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_FT2_CONFIG" = x; then
- FT2_CONFIG="false"
+ if test "x$ac_ct_PKG_CONFIG" = x; then
+ PKG_CONFIG="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -19679,37 +19640,45 @@ yes:)
$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
+ PKG_CONFIG=$ac_ct_PKG_CONFIG
fi
else
- FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+ PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
fi
-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
- FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
- as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
+if $PKG_CONFIG libpng; then
+ LIBPNG_INCLUDES=`$PKG_CONFIG libpng --cflags`
+ LIBPNG_LIBS=`$PKG_CONFIG libpng --libs`
+elif test "x$need_libpng:$with_system_libpng" = xyes:yes; then
+ as_fn_error $? "did not find libpng" "$LINENO" 5
fi
-if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
- GD_INCLUDES="-I$with_gd_includes"
+if test "x$with_t1lib_includes" != x && test "x$with_t1lib_includes" != xyes; then
+ T1LIB_INCLUDES="-I$with_t1lib_includes"
fi
-GD_LIBS="-lgd"
-if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then
- GD_LIBS="-L$with_gd_libdir $GD_LIBS"
+T1LIB_LIBS="-lt1"
+if test "x$with_t1lib_libdir" != x && test "x$with_t1lib_libdir" != xyes; then
+ T1LIB_LIBS="-L$with_t1lib_libdir $T1LIB_LIBS"
+fi
+
+if test "x$with_freetype_includes" != x && test "x$with_freetype_includes" != xyes; then
+ FREETYPE_INCLUDES="-I$with_freetype_includes"
+fi
+FREETYPE_LIBS="-lttf"
+if test "x$with_freetype_libdir" != x && test "x$with_freetype_libdir" != xyes; then
+ FREETYPE_LIBS="-L$with_freetype_libdir $FREETYPE_LIBS"
fi
if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+ # 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_PKG_CONFIG+:} false; then :
+if ${ac_cv_prog_FT2_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$PKG_CONFIG"; then
- ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
+ 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
@@ -19718,7 +19687,7 @@ do
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_PKG_CONFIG="${ac_tool_prefix}pkg-config"
+ ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -19728,10 +19697,10 @@ IFS=$as_save_IFS
fi
fi
-PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+FT2_CONFIG=$ac_cv_prog_FT2_CONFIG
+if test -n "$FT2_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5
+$as_echo "$FT2_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -19739,17 +19708,17 @@ fi
fi
-if test -z "$ac_cv_prog_PKG_CONFIG"; then
- ac_ct_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+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:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then :
+if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_PKG_CONFIG"; then
- ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
+ 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
@@ -19758,7 +19727,7 @@ do
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_PKG_CONFIG="pkg-config"
+ ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -19768,17 +19737,17 @@ IFS=$as_save_IFS
fi
fi
-ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
-if test -n "$ac_ct_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5
-$as_echo "$ac_ct_PKG_CONFIG" >&6; }
+ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG
+if test -n "$ac_ct_FT2_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5
+$as_echo "$ac_ct_FT2_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "x$ac_ct_PKG_CONFIG" = x; then
- PKG_CONFIG="false"
+ if test "x$ac_ct_FT2_CONFIG" = x; then
+ FT2_CONFIG="false"
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -19786,10 +19755,25 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- PKG_CONFIG=$ac_ct_PKG_CONFIG
+ FT2_CONFIG=$ac_ct_FT2_CONFIG
fi
else
- PKG_CONFIG="$ac_cv_prog_PKG_CONFIG"
+ FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+fi
+
+if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+ FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+ FREETYPE2_LIBS=`$FT2_CONFIG --libs`
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+ as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
+fi
+
+if test "x$with_gd_includes" != x && test "x$with_gd_includes" != xyes; then
+ GD_INCLUDES="-I$with_gd_includes"
+fi
+GD_LIBS="-lgd"
+if test "x$with_gd_libdir" != x && test "x$with_gd_libdir" != xyes; then
+ GD_LIBS="-L$with_gd_libdir $GD_LIBS"
fi
if $PKG_CONFIG poppler --atleast-version=0.10; then