From e96d533771de7ceeb155f9e2a093e67e0dc40ab1 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 12 Mar 2015 14:42:02 +0000 Subject: Build system: Reorganize flags for system (installed) libraries git-svn-id: svn://tug.org/texlive/trunk@36495 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/mendexk/Makefile.in | 1 + Build/source/texk/mendexk/configure | 157 +++++++++++++++++++++++----------- 2 files changed, 110 insertions(+), 48 deletions(-) (limited to 'Build/source/texk/mendexk') diff --git a/Build/source/texk/mendexk/Makefile.in b/Build/source/texk/mendexk/Makefile.in index 87d2c7850d3..0a69341e785 100644 --- a/Build/source/texk/mendexk/Makefile.in +++ b/Build/source/texk/mendexk/Makefile.in @@ -484,6 +484,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ PTEXENC_DEPEND = @PTEXENC_DEPEND@ PTEXENC_INCLUDES = @PTEXENC_INCLUDES@ PTEXENC_LIBS = @PTEXENC_LIBS@ diff --git a/Build/source/texk/mendexk/configure b/Build/source/texk/mendexk/configure index 4fd71aaeea4..17cdb107d9f 100755 --- a/Build/source/texk/mendexk/configure +++ b/Build/source/texk/mendexk/configure @@ -641,6 +641,7 @@ KPATHSEA_RULE KPATHSEA_DEPEND KPATHSEA_LIBS KPATHSEA_INCLUDES +PKG_CONFIG CPP LT_SYS_LIBRARY_PATH OTOOL64 @@ -776,11 +777,7 @@ with_sysroot enable_libtool_lock enable_largefile with_system_kpathsea -with_kpathsea_includes -with_kpathsea_libdir with_system_ptexenc -with_ptexenc_includes -with_ptexenc_libdir ' ac_precious_vars='build_alias host_alias @@ -1441,16 +1438,10 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-system-kpathsea use installed kpathsea headers and library - --with-kpathsea-includes=DIR - kpathsea headers installed in DIR - --with-kpathsea-libdir=DIR - kpathsea library installed in DIR - --with-system-ptexenc use installed ptexenc headers and library - --with-ptexenc-includes=DIR - ptexenc headers installed in DIR - --with-ptexenc-libdir=DIR - ptexenc library installed in DIR + --with-system-kpathsea use installed kpathsea headers and library (requires + pkg-config) + --with-system-ptexenc use installed ptexenc headers and library (requires + pkg-config) Some influential environment variables: CC C compiler command @@ -14754,29 +14745,110 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_link="./libtool --mode=link --tag=CC $ac_link" -## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags +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 +{ $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 : + $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. +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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 +done + done +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +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 +{ $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 : + $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. +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 as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + 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 +done + done +IFS=$as_save_IFS -# Check whether --with-system-kpathsea was given. -if test "${with_system_kpathsea+set}" = set; then : - withval=$with_system_kpathsea; +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Check whether --with-kpathsea-includes was given. -if test "${with_kpathsea_includes+set}" = set; then : - withval=$with_kpathsea_includes; + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$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 + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" fi -# Check whether --with-kpathsea-libdir was given. -if test "${with_kpathsea_libdir+set}" = set; then : - withval=$with_kpathsea_libdir; +## _KPSE_LIB_FLAGS: Setup kpathsea (-lkpathsea) flags + +# Check whether --with-system-kpathsea was given. +if test "${with_system_kpathsea+set}" = set; then : + withval=$with_system_kpathsea; fi if test "x$with_system_kpathsea" = xyes; then - if test "x$with_kpathsea_includes" != x && test "x$with_kpathsea_includes" != xyes; then - KPATHSEA_INCLUDES="-I$with_kpathsea_includes" -fi -KPATHSEA_LIBS="-lkpathsea" -if test "x$with_kpathsea_libdir" != x && test "x$with_kpathsea_libdir" != xyes; then - KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS" + if $PKG_CONFIG kpathsea; then + KPATHSEA_INCLUDES=`$PKG_CONFIG kpathsea --cflags` + KPATHSEA_LIBS=`$PKG_CONFIG kpathsea --libs` +elif test "x$need_kpathsea:$with_system_kpathsea" = xyes:yes; then + as_fn_error $? "did not find kpathsea" "$LINENO" 5 fi else KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk" @@ -14797,7 +14869,7 @@ else eval CPPFLAGS=\"$KPATHSEA_INCLUDES \$CPPFLAGS\" eval LIBS=\"$KPATHSEA_LIBS \$LIBS\" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -14815,7 +14887,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CPPFLAGS=$kpse_save_CPPFLAGS + CPPFLAGS=$kpse_save_CPPFLAGS LIBS=$kpse_save_LIBS fi @@ -14831,23 +14903,12 @@ fi if test "${with_system_ptexenc+set}" = set; then : withval=$with_system_ptexenc; fi - -# Check whether --with-ptexenc-includes was given. -if test "${with_ptexenc_includes+set}" = set; then : - withval=$with_ptexenc_includes; -fi - -# Check whether --with-ptexenc-libdir was given. -if test "${with_ptexenc_libdir+set}" = set; then : - withval=$with_ptexenc_libdir; -fi if test "x$with_system_ptexenc" = xyes; then - if test "x$with_ptexenc_includes" != x && test "x$with_ptexenc_includes" != xyes; then - PTEXENC_INCLUDES="-I$with_ptexenc_includes" -fi -PTEXENC_LIBS="-lptexenc" -if test "x$with_ptexenc_libdir" != x && test "x$with_ptexenc_libdir" != xyes; then - PTEXENC_LIBS="-L$with_ptexenc_libdir $PTEXENC_LIBS" + if $PKG_CONFIG ptexenc; then + PTEXENC_INCLUDES=`$PKG_CONFIG ptexenc --cflags` + PTEXENC_LIBS=`$PKG_CONFIG ptexenc --libs` +elif test "x$need_ptexenc:$with_system_ptexenc" = xyes:yes; then + as_fn_error $? "did not find ptexenc" "$LINENO" 5 fi else PTEXENC_INCLUDES="-I$kpse_BLD/texk/ptexenc -I$kpse_SRC/texk/ptexenc" -- cgit v1.2.3