diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-12 14:42:02 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-03-12 14:42:02 +0000 |
commit | e96d533771de7ceeb155f9e2a093e67e0dc40ab1 (patch) | |
tree | e307e1ae0d17abcb640c37be30b7bdf5e370e074 /Build/source/m4/kpse-kpathsea-flags.m4 | |
parent | 43053489cfb1957b1779be81ba6bd1ac96f71165 (diff) |
Build system: Reorganize flags for system (installed) libraries
git-svn-id: svn://tug.org/texlive/trunk@36495 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4/kpse-kpathsea-flags.m4')
-rw-r--r-- | Build/source/m4/kpse-kpathsea-flags.m4 | 53 |
1 files changed, 25 insertions, 28 deletions
diff --git a/Build/source/m4/kpse-kpathsea-flags.m4 b/Build/source/m4/kpse-kpathsea-flags.m4 index 7e5ed3273a5..f0bae6f8067 100644 --- a/Build/source/m4/kpse-kpathsea-flags.m4 +++ b/Build/source/m4/kpse-kpathsea-flags.m4 @@ -1,23 +1,20 @@ # Public macros for the TeX Live (TL) tree. -# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org> +# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org> # # This file is free software; the copyright holder # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 0 - # KPSE_KPATHSEA_FLAGS([OPTIONS]) # ------------------------------ -# Provide the configure options '--with-system-kpathsea' (if in the TL tree), -# '--with-kpathsea-includes', and '--with-kpathsea-libdir'. +# Provide the configure options '--with-system-kpathsea' (if in the TL tree). # Options: # no-debug - add '-DNO_DEBUG' to KPATHSEA_INCLUDES even if not needed # # Set the make variables KPATHSEA_INCLUDES and KPATHSEA_LIBS to the CPPFLAGS and # LIBS required for the `-lkpathsea' library in texk/kpathsea/ of the TL tree. -AC_DEFUN([KPSE_KPATHSEA_FLAGS], -[AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl +AC_DEFUN([KPSE_KPATHSEA_FLAGS], [dnl +AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl _KPSE_TEXLIB_FLAGS([kpathsea], [kpathsea], [lt], [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [], [${top_srcdir}/../kpathsea/*.[ch]], @@ -29,46 +26,46 @@ m4_if(m4_index([ $1 ], [ no-debug ]), [-1], # KPSE_KPATHSEA_OPTIONS([WITH-SYSTEM]) # ------------------------------------ -AC_DEFUN([KPSE_KPATHSEA_OPTIONS], [_KPSE_LIB_OPTIONS([kpathsea], [$1])]) +AC_DEFUN([KPSE_KPATHSEA_OPTIONS], [_KPSE_LIB_OPTIONS([kpathsea], [$1], [pkg-config])]) # _KPSE_CHECK_KPSE_DEBUG # ---------------------- # Internal subroutine to check if libkpathsea supports debugging. -m4_define([_KPSE_CHECK_KPSE_DEBUG], -[AC_CACHE_CHECK([if libkpathsea supports debugging], - [kpse_cv_kpse_debug], - [KPSE_ADD_FLAGS([kpathsea]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <kpathsea/kpathsea.h>]], - [[FILE *f = fopen("f", "r")]])], - [kpse_cv_kpse_debug=yes], - [kpse_cv_kpse_debug=no]) - KPSE_RESTORE_FLAGS]) +m4_define([_KPSE_CHECK_KPSE_DEBUG], [dnl +AC_CACHE_CHECK([if libkpathsea supports debugging], + [kpse_cv_kpse_debug], + [KPSE_ADD_FLAGS([kpathsea]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <kpathsea/kpathsea.h>]], + [[FILE *f = fopen("f", "r")]])], + [kpse_cv_kpse_debug=yes], + [kpse_cv_kpse_debug=no]) + KPSE_RESTORE_FLAGS]) AS_IF([test "x$kpse_cv_kpse_debug" != xyes], [KPATHSEA_INCLUDES="$KPATHSEA_INCLUDES -DNO_DEBUG"])[]dnl ]) # _KPSE_CHECK_KPSE_DEBUG # KPSE_KPATHSEA_SYSTEM_FLAGS # -------------------------- -AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([kpathsea], [kpathsea])]) +AC_DEFUN([KPSE_KPATHSEA_SYSTEM_FLAGS], [dnl +_KPSE_PKG_CONFIG_FLAGS([kpathsea], [kpathsea])]) # KPSE_CHECK_KPSE_FORMAT(FORMAT, # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # ---------------------------------------------------------------- # Check whether kpathsea declares the kpse_FORMAT_format. -AC_DEFUN([KPSE_CHECK_KPSE_FORMAT], -[AC_CACHE_CHECK([whether kpathsea declares the kpse_$1_format], - [kpse_cv_have_$1_format], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <kpathsea/kpathsea.h>]], - [[kpse_$1_format]])], - [kpse_cv_have_$1_format=yes], - [kpse_cv_have_$1_format=no])]) +AC_DEFUN([KPSE_CHECK_KPSE_FORMAT], [dnl +AC_CACHE_CHECK([whether kpathsea declares the kpse_$1_format], + [kpse_cv_have_$1_format], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <kpathsea/kpathsea.h>]], + [[kpse_$1_format]])], + [kpse_cv_have_$1_format=yes], + [kpse_cv_have_$1_format=no])]) AS_IF([test "x$kpse_cv_have_$1_format" = xyes], [$2], [$3]) ]) # KPSE_CHECK_KPSE_FORMAT # KPSE_CHECK_XBASENAME([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -------------------------------------------------------------- # Check whether kpathsea declares xbasename(). -AC_DEFUN([KPSE_CHECK_XBASENAME], -[AC_CHECK_DECL([xbasename], [$1], [$2], - [[#include <kpathsea/kpathsea.h>]]) +AC_DEFUN([KPSE_CHECK_XBASENAME], [dnl +AC_CHECK_DECL([xbasename], [$1], [$2], [[#include <kpathsea/kpathsea.h>]]) ]) # KPSE_CHECK_XBASENAME |