mirror of
https://github.com/owntone/owntone-server.git
synced 2025-01-24 13:13:17 -05:00
[config] Updated libunistring macro
This commit is contained in:
Scott Shambarger
parent
a1498fbe4f
commit
97afb22dc8
77
m4/absolute-header.m4
Normal file
77
m4/absolute-header.m4
Normal file
@ -0,0 +1,77 @@
|
||||
# absolute-header.m4 serial 12
|
||||
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Derek Price.
|
||||
|
||||
# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...)
|
||||
# ---------------------------------------
|
||||
# Find the absolute name of a header file, testing first if the header exists.
|
||||
# If the header were sys/inttypes.h, this macro would define
|
||||
# ABSOLUTE_SYS_INTTYPES_H to the `""' quoted absolute name of sys/inttypes.h
|
||||
# in config.h
|
||||
# (e.g. `#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"').
|
||||
# The three "///" are to pacify Sun C 5.8, which otherwise would say
|
||||
# "warning: #include of /usr/include/... may be non-portable".
|
||||
# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
|
||||
# Note: This macro assumes that the header file is not empty after
|
||||
# preprocessing, i.e. it does not only define preprocessor macros but also
|
||||
# provides some type/enum definitions or function/variable declarations.
|
||||
AC_DEFUN([gl_ABSOLUTE_HEADER],
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_LANG_PREPROC_REQUIRE()dnl
|
||||
m4_foreach_w([gl_HEADER_NAME], [$1],
|
||||
[AS_VAR_PUSHDEF([gl_absolute_header],
|
||||
[gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl
|
||||
AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>],
|
||||
m4_defn([gl_absolute_header]),
|
||||
[AS_VAR_PUSHDEF([ac_header_exists],
|
||||
[ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl
|
||||
AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl
|
||||
if test AS_VAR_GET(ac_header_exists) = yes; then
|
||||
gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME]))
|
||||
fi
|
||||
AS_VAR_POPDEF([ac_header_exists])dnl
|
||||
])dnl
|
||||
AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])),
|
||||
["AS_VAR_GET(gl_absolute_header)"],
|
||||
[Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.])
|
||||
AS_VAR_POPDEF([gl_absolute_header])dnl
|
||||
])dnl
|
||||
])# gl_ABSOLUTE_HEADER
|
||||
|
||||
# gl_ABSOLUTE_HEADER_ONE(HEADER)
|
||||
# ------------------------------
|
||||
# Like gl_ABSOLUTE_HEADER, except that:
|
||||
# - it assumes that the header exists,
|
||||
# - it uses the current CPPFLAGS,
|
||||
# - it does not cache the result,
|
||||
# - it is silent.
|
||||
AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
|
||||
[
|
||||
AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])])
|
||||
dnl AIX "xlc -E" and "cc -E" omit #line directives for header files
|
||||
dnl that contain only a #include of other header files and no
|
||||
dnl non-comment tokens of their own. This leads to a failure to
|
||||
dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h>
|
||||
dnl and others. The workaround is to force preservation of comments
|
||||
dnl through option -C. This ensures all necessary #line directives
|
||||
dnl are present. GCC supports option -C as well.
|
||||
case "$host_os" in
|
||||
aix*) gl_absname_cpp="$ac_cpp -C" ;;
|
||||
*) gl_absname_cpp="$ac_cpp" ;;
|
||||
esac
|
||||
dnl eval is necessary to expand gl_absname_cpp.
|
||||
dnl Ultrix and Pyramid sh refuse to redirect output of eval,
|
||||
dnl so use subshell.
|
||||
AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]),
|
||||
[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
|
||||
sed -n '\#/$1#{
|
||||
s#.*"\(.*/$1\)".*#\1#
|
||||
s#^/[^/]#//&#
|
||||
p
|
||||
q
|
||||
}'`])
|
||||
])
|
||||
@ -1,5 +1,5 @@
|
||||
# libunistring.m4 serial 4
|
||||
dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
|
||||
# libunistring.m4 serial 11
|
||||
dnl Copyright (C) 2009-2012 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
@ -7,22 +7,76 @@ dnl with or without modifications, as long as this notice is preserved.
|
||||
dnl gl_LIBUNISTRING
|
||||
dnl Searches for an installed libunistring.
|
||||
dnl If found, it sets and AC_SUBSTs HAVE_LIBUNISTRING=yes and the LIBUNISTRING
|
||||
dnl and LTLIBUNISTRING variables and augments the CPPFLAGS variable, and
|
||||
dnl #defines HAVE_LIBUNISTRING to 1. Otherwise, it sets and AC_SUBSTs
|
||||
dnl HAVE_LIBUNISTRING=no and LIBUNISTRING and LTLIBUNISTRING to empty.
|
||||
dnl and LTLIBUNISTRING variables, sets the LIBUNISTRING_VERSION variable, and
|
||||
dnl augments the CPPFLAGS variable, and #defines HAVE_LIBUNISTRING to 1.
|
||||
dnl Otherwise, it sets and AC_SUBSTs HAVE_LIBUNISTRING=no and LIBUNISTRING and
|
||||
dnl LTLIBUNISTRING to empty.
|
||||
|
||||
AC_DEFUN([gl_LIBUNISTRING],
|
||||
dnl Define gl_LIBUNISTRING using AC_DEFUN_ONCE for Autoconf >= 2.64, in order
|
||||
dnl to avoid warnings like
|
||||
dnl "warning: AC_REQUIRE: `gl_LIBUNISTRING' was expanded before it was required".
|
||||
dnl This is tricky because of the way 'aclocal' is implemented:
|
||||
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
||||
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
||||
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
||||
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
||||
dnl warnings.
|
||||
m4_define([gl_libunistring_AC_DEFUN],
|
||||
m4_version_prereq([2.64],
|
||||
[[AC_DEFUN_ONCE(
|
||||
[$1], [$2])]],
|
||||
[m4_ifdef([gl_00GNULIB],
|
||||
[[AC_DEFUN_ONCE(
|
||||
[$1], [$2])]],
|
||||
[[AC_DEFUN(
|
||||
[$1], [$2])]])]))
|
||||
gl_libunistring_AC_DEFUN([gl_LIBUNISTRING],
|
||||
[
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_MODULE])
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_LIBHEADER])
|
||||
AC_BEFORE([$0], [gl_LIBUNISTRING_LIB_PREPARE])
|
||||
|
||||
m4_ifdef([gl_LIBUNISTRING_OPTIONAL],
|
||||
[
|
||||
AC_MSG_CHECKING([whether included libunistring is requested])
|
||||
AC_ARG_WITH([included-libunistring],
|
||||
[ --with-included-libunistring use the libunistring parts included here],
|
||||
[gl_libunistring_force_included=$withval],
|
||||
[gl_libunistring_force_included=no])
|
||||
AC_MSG_RESULT([$gl_libunistring_force_included])
|
||||
gl_libunistring_use_included="$gl_libunistring_force_included"
|
||||
if test "$gl_libunistring_use_included" = yes; then
|
||||
dnl Assume that libunistring is not installed until some other macro
|
||||
dnl explicitly invokes gl_LIBUNISTRING_CORE.
|
||||
if test -z "$HAVE_LIBUNISTRING"; then
|
||||
HAVE_LIBUNISTRING=no
|
||||
fi
|
||||
LIBUNISTRING=
|
||||
LTLIBUNISTRING=
|
||||
else
|
||||
gl_LIBUNISTRING_CORE
|
||||
if test $HAVE_LIBUNISTRING = no; then
|
||||
gl_libunistring_use_included=yes
|
||||
LIBUNISTRING=
|
||||
LTLIBUNISTRING=
|
||||
fi
|
||||
fi
|
||||
],
|
||||
[gl_LIBUNISTRING_CORE])
|
||||
])
|
||||
|
||||
AC_DEFUN([gl_LIBUNISTRING_CORE],
|
||||
[
|
||||
AC_REQUIRE([AM_ICONV])
|
||||
if test -n "$LIBICONV"; then
|
||||
dnl First, try to link without -liconv. libunistring often depends on
|
||||
dnl libiconv, but we don't know (and often don't need to know) where
|
||||
dnl libiconv is installed.
|
||||
AC_LIB_HAVE_LINKFLAGS([unistring], [],
|
||||
[#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
|
||||
[no, consider installing GNU libunistring])
|
||||
[no, trying again together with libiconv])
|
||||
if test "$ac_cv_libunistring" != yes; then
|
||||
dnl Second try, with -liconv.
|
||||
AC_REQUIRE([AM_ICONV])
|
||||
if test -n "$LIBICONV"; then
|
||||
dnl We have to erase the cached result of the first AC_LIB_HAVE_LINKFLAGS
|
||||
dnl invocation, otherwise the second one will not be run.
|
||||
unset ac_cv_libunistring
|
||||
@ -37,5 +91,60 @@ AC_DEFUN([gl_LIBUNISTRING],
|
||||
fi
|
||||
LIBS="$glus_save_LIBS"
|
||||
fi
|
||||
else
|
||||
AC_LIB_HAVE_LINKFLAGS([unistring], [],
|
||||
[#include <uniconv.h>], [u8_strconv_from_locale((char*)0);],
|
||||
[no, consider installing GNU libunistring])
|
||||
fi
|
||||
if test $HAVE_LIBUNISTRING = yes; then
|
||||
dnl Determine the installed version.
|
||||
AC_CACHE_CHECK([for libunistring version], [gl_cv_libunistring_version],
|
||||
[AC_COMPUTE_INT([gl_libunistring_hexversion],
|
||||
[_LIBUNISTRING_VERSION],
|
||||
[#include <unistring/version.h>])
|
||||
dnl Versions <= 0.9.3 had a hexversion of 0x0009.
|
||||
dnl Use other tests to distinguish them.
|
||||
if test $gl_libunistring_hexversion = 9; then
|
||||
dnl Version 0.9.2 introduced the header <unistring/cdefs.h>.
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM([[#include <unistring/cdefs.h>]], [[]])],
|
||||
[gl_cv_libunistring_version092=true],
|
||||
[gl_cv_libunistring_version092=false])
|
||||
if $gl_cv_libunistring_version092; then
|
||||
dnl Version 0.9.3 changed a comment in <unistr.h>.
|
||||
gl_ABSOLUTE_HEADER_ONE([unistr.h])
|
||||
if test -n "$gl_cv_absolute_unistr_h" \
|
||||
&& grep 'Copy no more than N units of SRC to DEST. Return a pointer' $gl_cv_absolute_unistr_h > /dev/null; then
|
||||
dnl Detected version 0.9.3.
|
||||
gl_libunistring_hexversion=2307
|
||||
else
|
||||
dnl Detected version 0.9.2.
|
||||
gl_libunistring_hexversion=2306
|
||||
fi
|
||||
else
|
||||
dnl Version 0.9.1 introduced the type casing_suffix_context_t.
|
||||
AC_COMPILE_IFELSE(
|
||||
[AC_LANG_PROGRAM(
|
||||
[[#include <unicase.h>
|
||||
casing_suffix_context_t ct;]],
|
||||
[[]])],
|
||||
[gl_cv_libunistring_version091=true],
|
||||
[gl_cv_libunistring_version091=false])
|
||||
if $gl_cv_libunistring_version091; then
|
||||
dnl Detected version 0.9.1.
|
||||
gl_libunistring_hexversion=2305
|
||||
else
|
||||
dnl Detected version 0.9.
|
||||
gl_libunistring_hexversion=2304
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
dnl Transform into the usual major.minor.subminor notation.
|
||||
gl_libunistring_major=`expr $gl_libunistring_hexversion / 65536`
|
||||
gl_libunistring_minor=`expr $gl_libunistring_hexversion / 256 % 256`
|
||||
gl_libunistring_subminor=`expr $gl_libunistring_hexversion % 256`
|
||||
gl_cv_libunistring_version="$gl_libunistring_major.$gl_libunistring_minor.$gl_libunistring_subminor"
|
||||
])
|
||||
LIBUNISTRING_VERSION="$gl_cv_libunistring_version"
|
||||
fi
|
||||
])
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user