@@ -20,17 +20,16 @@ | |||||
# Process this file with autoconf to produce a configure script. | # Process this file with autoconf to produce a configure script. | ||||
# | # | ||||
AC_PREREQ(2.61) | AC_PREREQ(2.61) | ||||
AC_INIT([gnunet-secushare],[0.0.0],[bug-gnunet@gnu.org]) | |||||
AM_INIT_AUTOMAKE([gnunet-secushare], [0.0.0]) | |||||
AM_CONFIG_HEADER(gnunet_secushare_config.h) | |||||
AC_INIT([gnunet-secushare],[0.11.0],[bug-gnunet@gnu.org]) | |||||
AM_INIT_AUTOMAKE | |||||
AC_CONFIG_HEADERS([gnunet_secushare_config.h]) | |||||
AC_CONFIG_MACRO_DIR([m4]) | |||||
AH_TOP([#define _GNU_SOURCE 1]) | AH_TOP([#define _GNU_SOURCE 1]) | ||||
AC_ISC_POSIX | AC_ISC_POSIX | ||||
AC_PROG_AWK | AC_PROG_AWK | ||||
AC_PROG_CC | AC_PROG_CC | ||||
AC_PROG_MKDIR_P | |||||
AC_PROG_CPP | AC_PROG_CPP | ||||
AC_PROG_INSTALL | AC_PROG_INSTALL | ||||
AC_PROG_LN_S | AC_PROG_LN_S | ||||
@@ -40,6 +39,7 @@ AC_PROG_CC | |||||
AM_PROG_CC_STDC | AM_PROG_CC_STDC | ||||
AC_HEADER_STDC | AC_HEADER_STDC | ||||
AC_CANONICAL_HOST | AC_CANONICAL_HOST | ||||
AC_SUBST(MKDIR_P) | |||||
# dynamic libraries/plugins | # dynamic libraries/plugins | ||||
AC_DISABLE_STATIC | AC_DISABLE_STATIC | ||||
@@ -168,6 +168,45 @@ then | |||||
fi | fi | ||||
# gcov compilation | |||||
AC_MSG_CHECKING(whether to compile with support for code coverage analysis) | |||||
AC_ARG_ENABLE([coverage], | |||||
AS_HELP_STRING([--enable-coverage], | |||||
[compile the library with code coverage support]), | |||||
[use_gcov=${enableval}], | |||||
[use_gcov=no]) | |||||
AC_MSG_RESULT($use_gcov) | |||||
AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"]) | |||||
# should 'make check' run tests? | |||||
AC_MSG_CHECKING(whether to run tests) | |||||
AC_ARG_ENABLE([testruns], | |||||
[AS_HELP_STRING([--disable-testruns], [disable running tests on make check (default is YES)])], | |||||
[enable_tests_run=${enableval}], | |||||
[enable_tests_run=yes]) | |||||
AC_MSG_RESULT($enable_test_run) | |||||
AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) | |||||
# should gnunet-testing be compiled | |||||
AC_MSG_CHECKING(wether to compile gnunet-testing) | |||||
AC_ARG_ENABLE([testing], | |||||
[AS_HELP_STRING([--disable-testing], [do not build gnunet-testing])], | |||||
[enable_testing=${enableval}], | |||||
[enable_testing=yes]) | |||||
AC_MSG_RESULT($enable_testing) | |||||
AM_CONDITIONAL([HAVE_TESTING], [test "x$enable_testing" = "xyes"]) | |||||
# should experimental code be compiled (code that may not yet compile)? | |||||
AC_MSG_CHECKING(whether to compile experimental code) | |||||
AC_ARG_ENABLE([experimental], | |||||
[AS_HELP_STRING([--enable-experimental], [enable compiling experimental code])], | |||||
[enable_experimental=${enableval}], | |||||
[enable_experimental=no]) | |||||
AC_MSG_RESULT($enable_experimental) | |||||
AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) | |||||
# Linker hardening options | # Linker hardening options | ||||
# Currently these options are ELF specific - you can't use this with MacOSX | # Currently these options are ELF specific - you can't use this with MacOSX | ||||
@@ -178,6 +217,155 @@ AC_ARG_ENABLE(linker-hardening, | |||||
fi]) | fi]) | ||||
SAVE_LDFLAGS=$LDFLAGS | |||||
SAVE_CPPFLAGS=$CPPFLAGS | |||||
# test for sqlite | |||||
sqlite=false | |||||
AC_MSG_CHECKING(for SQLite) | |||||
AC_ARG_WITH(sqlite, | |||||
[ --with-sqlite=PFX base of SQLite installation], | |||||
[AC_MSG_RESULT("$with_sqlite") | |||||
case $with_sqlite in | |||||
no) | |||||
;; | |||||
yes) | |||||
AC_CHECK_HEADERS(sqlite3.h, | |||||
sqlite=true) | |||||
;; | |||||
*) | |||||
LDFLAGS="-L$with_sqlite/lib $LDFLAGS" | |||||
CPPFLAGS="-I$with_sqlite/include $CPPFLAGS" | |||||
AC_CHECK_HEADERS(sqlite3.h, | |||||
EXT_LIB_PATH="-L$with_sqlite/lib $EXT_LIB_PATH" | |||||
SQLITE_LDFLAGS="-L$with_sqlite/lib" | |||||
SQLITE_CPPFLAGS="-I$with_sqlite/include" | |||||
sqlite=true) | |||||
LDFLAGS=$SAVE_LDFLAGS | |||||
CPPFLAGS=$SAVE_CPPFLAGS | |||||
;; | |||||
esac | |||||
], | |||||
[AC_MSG_RESULT([--with-sqlite not specified]) | |||||
AC_CHECK_HEADERS(sqlite3.h, sqlite=true)]) | |||||
AM_CONDITIONAL(HAVE_SQLITE, test x$sqlite = xtrue) | |||||
AC_SUBST(SQLITE_CPPFLAGS) | |||||
AC_SUBST(SQLITE_LDFLAGS) | |||||
LDFLAGS=$SAVE_LDFLAGS | |||||
CPPFLAGS=$SAVE_CPPFLAGS | |||||
# test for postgres | |||||
postgres=false | |||||
# even running the check for postgres breaks emscripten ... | |||||
AS_IF([test "$taler_only" != yes], | |||||
[AX_LIB_POSTGRESQL([9.5], | |||||
[CPPFLAGS="$CPPFLAGS $POSTGRESQL_CPPFLAGS" | |||||
AC_CHECK_HEADERS([libpq-fe.h], | |||||
postgres=true) | |||||
], | |||||
[AC_MSG_RESULT([no postgres])])]) | |||||
AM_CONDITIONAL(HAVE_POSTGRESQL, test x$postgres = xtrue) | |||||
LDFLAGS=$SAVE_LDFLAGS | |||||
CPPFLAGS=$SAVE_CPPFLAGS | |||||
# mysql & windows | |||||
AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>]) | |||||
AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>]) | |||||
if test "$build_target" = "mingw" | |||||
then | |||||
CYGWIN_MYSQL_MAGIC="#include <mysql/my_global.h>" | |||||
fi | |||||
# test for mysql | |||||
mysql=false | |||||
mysqlfail=false | |||||
SAVE_LDFLAGS=$LDFLAGS | |||||
SAVE_CPPFLAGS=$CPPFLAGS | |||||
AC_MSG_CHECKING(for mysql) | |||||
AC_ARG_WITH(mysql, | |||||
[ --with-mysql=PFX base of MySQL installation], | |||||
[AC_MSG_RESULT([$with_mysql]) | |||||
case $with_mysql in | |||||
no) | |||||
;; | |||||
yes|"") | |||||
AC_CHECK_HEADERS(mysql/mysql.h, | |||||
AC_CHECK_LIB(mysqlclient, mysql_init, | |||||
mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) | |||||
;; | |||||
*) | |||||
LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS" | |||||
CPPFLAGS="-I$with_mysql/include $CPPFLAGS" | |||||
AC_CHECK_HEADERS(mysql/mysql.h, | |||||
AC_CHECK_LIB(mysqlclient, mysql_init, | |||||
MYSQL_LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql" | |||||
MYSQL_CPPFLAGS="-I$with_mysql/include" | |||||
mysql=true), [], [$CYGWIN_MYSQL_MAGIC]) | |||||
;; | |||||
esac | |||||
], | |||||
[AC_MSG_RESULT([--with-mysql not specified]) | |||||
if test -d "/usr/lib64/mysql"; then | |||||
MYSQL_LIBDIR="/usr/lib64/mysql" | |||||
elif test -d "/usr/lib/mysql"; then | |||||
MYSQL_LIBDIR="/usr/lib/mysql" | |||||
else | |||||
MYSQL_LIBDIR="/usr/lib" | |||||
fi | |||||
LDFLAGS="-L$MYSQL_LIBDIR $LDFLAGS $ZLIBS" | |||||
AC_CHECK_LIB(mysqlclient, mysql_init, | |||||
[AC_CHECK_HEADERS(mysql/mysql.h, | |||||
MYSQL_LDFLAGS="-L$MYSQL_LIBDIR" | |||||
mysql=true | |||||
, [], [$CYGWIN_MYSQL_MAGIC])]) | |||||
]) | |||||
AC_SUBST(MYSQL_LDFLAGS) | |||||
AC_SUBST(MYSQL_CPPFLAGS) | |||||
# additional version check for mysql | |||||
AC_ARG_ENABLE(mysql-version-check, [ --disable-mysql-version-check do not check MySQL version],, enable_mysql_version_check=yes) | |||||
if test "$mysql" = "true" -a "x$enable_mysql_version_check" = "xyes" | |||||
then | |||||
AC_MSG_CHECKING(mysql version) | |||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM( | |||||
[[$CYGWIN_MYSQL_MAGIC | |||||
#include <mysql/mysql.h>]], | |||||
[[ | |||||
#if (MYSQL_VERSION_ID < 40100) | |||||
#error needs at least version >= 4.1 | |||||
#endif | |||||
int main () { return 0; } | |||||
]]) | |||||
],mysql=true,mysql=false) | |||||
if test "$mysql" = "false" | |||||
then | |||||
mysqlfail=true | |||||
AC_MSG_RESULT([fail, >= 4.1 required]) | |||||
else | |||||
AC_MSG_RESULT(ok) | |||||
fi | |||||
fi | |||||
AM_CONDITIONAL(HAVE_MYSQL, test x$mysql = xtrue) | |||||
AM_CONDITIONAL(HAVE_MYSQLE, false) | |||||
# restore LIBS | |||||
LIBS=$SAVE_LIBS | |||||
LDFLAGS=$SAVE_LDFLAGS | |||||
CPPFLAGS=$SAVE_CPPFLAGS | |||||
if test "$sqlite" = 0 -a "$mysql" = 0 | |||||
then | |||||
AC_MSG_ERROR([GNUnet requires SQLite or MySQL]) | |||||
fi | |||||
extra_logging=GNUNET_NO | extra_logging=GNUNET_NO | ||||
AC_ARG_ENABLE([logging], | AC_ARG_ENABLE([logging], | ||||
AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]), | AS_HELP_STRING([--enable-logging@<:@=value@:>@],[Enable logging calls. Possible values: yes,no,verbose,veryverbose ('yes' is the default)]), | ||||
@@ -1,35 +1,35 @@ | |||||
dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) | |||||
dnl | |||||
dnl This macro _AC_DEFINEs VARNAME to the expansion of the DIR | |||||
dnl variable, taking care of fixing up ${prefix} and such. | |||||
dnl | |||||
dnl VARNAME is offered as both a C preprocessor symbol, and an output | |||||
dnl variable. | |||||
dnl | |||||
dnl Note that the 3 argument form is only supported with autoconf 2.13 | |||||
dnl and later (i.e. only where _AC_DEFINE supports 3 arguments). | |||||
dnl | |||||
dnl Examples: | |||||
dnl | |||||
dnl AC_DEFINE_DIR(DATADIR, datadir) | |||||
dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries]) | |||||
dnl | |||||
dnl @category Misc | |||||
dnl @author Stepan Kasal <kasal@ucw.cz> | |||||
dnl @author Andreas Schwab <schwab@suse.de> | |||||
dnl @author Guido Draheim <guidod@gmx.de> | |||||
dnl @author Alexandre Oliva | |||||
dnl @version 2005-01-17 | |||||
dnl @license AllPermissive | |||||
AC_DEFUN([AC_DEFINE_DIR], [ | |||||
prefix_NONE= | |||||
exec_prefix_NONE= | |||||
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix | |||||
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix | |||||
eval ac_define_dir="\"[$]$2\"" | |||||
AC_SUBST($1, "$ac_define_dir") | |||||
AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) | |||||
test "$prefix_NONE" && prefix=NONE | |||||
test "$exec_prefix_NONE" && exec_prefix=NONE | |||||
]) | |||||
dnl @synopsis AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) | |||||
dnl | |||||
dnl This macro _AC_DEFINEs VARNAME to the expansion of the DIR | |||||
dnl variable, taking care of fixing up ${prefix} and such. | |||||
dnl | |||||
dnl VARNAME is offered as both a C preprocessor symbol, and an output | |||||
dnl variable. | |||||
dnl | |||||
dnl Note that the 3 argument form is only supported with autoconf 2.13 | |||||
dnl and later (i.e. only where _AC_DEFINE supports 3 arguments). | |||||
dnl | |||||
dnl Examples: | |||||
dnl | |||||
dnl AC_DEFINE_DIR(DATADIR, datadir) | |||||
dnl AC_DEFINE_DIR(PROG_PATH, bindir, [Location of installed binaries]) | |||||
dnl | |||||
dnl @category Misc | |||||
dnl @author Stepan Kasal <kasal@ucw.cz> | |||||
dnl @author Andreas Schwab <schwab@suse.de> | |||||
dnl @author Guido Draheim <guidod@gmx.de> | |||||
dnl @author Alexandre Oliva | |||||
dnl @version 2005-01-17 | |||||
dnl @license AllPermissive | |||||
AC_DEFUN([AC_DEFINE_DIR], [ | |||||
prefix_NONE= | |||||
exec_prefix_NONE= | |||||
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix | |||||
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix | |||||
eval ac_define_dir="\"[$]$2\"" | |||||
AC_SUBST($1, "$ac_define_dir") | |||||
AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) | |||||
test "$prefix_NONE" && prefix=NONE | |||||
test "$exec_prefix_NONE" && exec_prefix=NONE | |||||
]) |
@@ -1,5 +1,5 @@ | |||||
# gettext.m4 serial 63 (gettext-0.18) | |||||
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. | |||||
# gettext.m4 serial 66 (gettext-0.18.2) | |||||
dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
@@ -35,7 +35,7 @@ dnl will be ignored. If NEEDSYMBOL is specified and is | |||||
dnl 'need-formatstring-macros', then GNU gettext implementations that don't | dnl 'need-formatstring-macros', then GNU gettext implementations that don't | ||||
dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. | dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. | ||||
dnl INTLDIR is used to find the intl libraries. If empty, | dnl INTLDIR is used to find the intl libraries. If empty, | ||||
dnl the value `$(top_builddir)/intl/' is used. | |||||
dnl the value '$(top_builddir)/intl/' is used. | |||||
dnl | dnl | ||||
dnl The result of the configuration is one of three cases: | dnl The result of the configuration is one of three cases: | ||||
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled | dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled | ||||
@@ -97,7 +97,7 @@ AC_DEFUN([AM_GNU_GETTEXT], | |||||
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) | AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) | ||||
]) | ]) | ||||
dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. | |||||
dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. | |||||
gt_INTL_MACOSX | gt_INTL_MACOSX | ||||
dnl Set USE_NLS. | dnl Set USE_NLS. | ||||
@@ -157,12 +157,18 @@ changequote([,])dnl | |||||
fi | fi | ||||
AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], | AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], | ||||
[AC_TRY_LINK([#include <libintl.h> | |||||
[AC_LINK_IFELSE( | |||||
[AC_LANG_PROGRAM( | |||||
[[ | |||||
#include <libintl.h> | |||||
$gt_revision_test_code | $gt_revision_test_code | ||||
extern int _nl_msg_cat_cntr; | extern int _nl_msg_cat_cntr; | ||||
extern int *_nl_domain_bindings;], | |||||
[bindtextdomain ("", ""); | |||||
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], | |||||
extern int *_nl_domain_bindings; | |||||
]], | |||||
[[ | |||||
bindtextdomain ("", ""); | |||||
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings | |||||
]])], | |||||
[eval "$gt_func_gnugettext_libc=yes"], | [eval "$gt_func_gnugettext_libc=yes"], | ||||
[eval "$gt_func_gnugettext_libc=no"])]) | [eval "$gt_func_gnugettext_libc=no"])]) | ||||
@@ -183,35 +189,47 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b | |||||
gt_save_LIBS="$LIBS" | gt_save_LIBS="$LIBS" | ||||
LIBS="$LIBS $LIBINTL" | LIBS="$LIBS $LIBINTL" | ||||
dnl Now see whether libintl exists and does not depend on libiconv. | dnl Now see whether libintl exists and does not depend on libiconv. | ||||
AC_TRY_LINK([#include <libintl.h> | |||||
AC_LINK_IFELSE( | |||||
[AC_LANG_PROGRAM( | |||||
[[ | |||||
#include <libintl.h> | |||||
$gt_revision_test_code | $gt_revision_test_code | ||||
extern int _nl_msg_cat_cntr; | extern int _nl_msg_cat_cntr; | ||||
extern | extern | ||||
#ifdef __cplusplus | #ifdef __cplusplus | ||||
"C" | "C" | ||||
#endif | #endif | ||||
const char *_nl_expand_alias (const char *);], | |||||
[bindtextdomain ("", ""); | |||||
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], | |||||
const char *_nl_expand_alias (const char *); | |||||
]], | |||||
[[ | |||||
bindtextdomain ("", ""); | |||||
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | |||||
]])], | |||||
[eval "$gt_func_gnugettext_libintl=yes"], | [eval "$gt_func_gnugettext_libintl=yes"], | ||||
[eval "$gt_func_gnugettext_libintl=no"]) | [eval "$gt_func_gnugettext_libintl=no"]) | ||||
dnl Now see whether libintl exists and depends on libiconv. | dnl Now see whether libintl exists and depends on libiconv. | ||||
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then | if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then | ||||
LIBS="$LIBS $LIBICONV" | LIBS="$LIBS $LIBICONV" | ||||
AC_TRY_LINK([#include <libintl.h> | |||||
AC_LINK_IFELSE( | |||||
[AC_LANG_PROGRAM( | |||||
[[ | |||||
#include <libintl.h> | |||||
$gt_revision_test_code | $gt_revision_test_code | ||||
extern int _nl_msg_cat_cntr; | extern int _nl_msg_cat_cntr; | ||||
extern | extern | ||||
#ifdef __cplusplus | #ifdef __cplusplus | ||||
"C" | "C" | ||||
#endif | #endif | ||||
const char *_nl_expand_alias (const char *);], | |||||
[bindtextdomain ("", ""); | |||||
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], | |||||
[LIBINTL="$LIBINTL $LIBICONV" | |||||
LTLIBINTL="$LTLIBINTL $LTLIBICONV" | |||||
eval "$gt_func_gnugettext_libintl=yes" | |||||
]) | |||||
const char *_nl_expand_alias (const char *); | |||||
]], | |||||
[[ | |||||
bindtextdomain ("", ""); | |||||
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") | |||||
]])], | |||||
[LIBINTL="$LIBINTL $LIBICONV" | |||||
LTLIBINTL="$LTLIBINTL $LTLIBICONV" | |||||
eval "$gt_func_gnugettext_libintl=yes" | |||||
]) | |||||
fi | fi | ||||
CPPFLAGS="$gt_save_CPPFLAGS" | CPPFLAGS="$gt_save_CPPFLAGS" | ||||
LIBS="$gt_save_LIBS"]) | LIBS="$gt_save_LIBS"]) | ||||
@@ -1,5 +1,5 @@ | |||||
# iconv.m4 serial 11 (gettext-0.18.1) | |||||
dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. | |||||
# iconv.m4 serial 18 (gettext-0.18.2) | |||||
dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
@@ -29,28 +29,36 @@ AC_DEFUN([AM_ICONV_LINK], | |||||
dnl Add $INCICONV to CPPFLAGS before performing the following checks, | dnl Add $INCICONV to CPPFLAGS before performing the following checks, | ||||
dnl because if the user has installed libiconv and not disabled its use | dnl because if the user has installed libiconv and not disabled its use | ||||
dnl via --without-libiconv-prefix, he wants to use it. The first | |||||
dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. | |||||
dnl via --without-libiconv-prefix, they want to use it. The first | |||||
dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. | |||||
am_save_CPPFLAGS="$CPPFLAGS" | am_save_CPPFLAGS="$CPPFLAGS" | ||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) | ||||
AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ | AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ | ||||
am_cv_func_iconv="no, consider installing GNU libiconv" | am_cv_func_iconv="no, consider installing GNU libiconv" | ||||
am_cv_lib_iconv=no | am_cv_lib_iconv=no | ||||
AC_TRY_LINK([#include <stdlib.h> | |||||
#include <iconv.h>], | |||||
[iconv_t cd = iconv_open("",""); | |||||
iconv(cd,NULL,NULL,NULL,NULL); | |||||
iconv_close(cd);], | |||||
AC_LINK_IFELSE( | |||||
[AC_LANG_PROGRAM( | |||||
[[ | |||||
#include <stdlib.h> | |||||
#include <iconv.h> | |||||
]], | |||||
[[iconv_t cd = iconv_open("",""); | |||||
iconv(cd,NULL,NULL,NULL,NULL); | |||||
iconv_close(cd);]])], | |||||
[am_cv_func_iconv=yes]) | [am_cv_func_iconv=yes]) | ||||
if test "$am_cv_func_iconv" != yes; then | if test "$am_cv_func_iconv" != yes; then | ||||
am_save_LIBS="$LIBS" | am_save_LIBS="$LIBS" | ||||
LIBS="$LIBS $LIBICONV" | LIBS="$LIBS $LIBICONV" | ||||
AC_TRY_LINK([#include <stdlib.h> | |||||
#include <iconv.h>], | |||||
[iconv_t cd = iconv_open("",""); | |||||
iconv(cd,NULL,NULL,NULL,NULL); | |||||
iconv_close(cd);], | |||||
AC_LINK_IFELSE( | |||||
[AC_LANG_PROGRAM( | |||||
[[ | |||||
#include <stdlib.h> | |||||
#include <iconv.h> | |||||
]], | |||||
[[iconv_t cd = iconv_open("",""); | |||||
iconv(cd,NULL,NULL,NULL,NULL); | |||||
iconv_close(cd);]])], | |||||
[am_cv_lib_iconv=yes] | [am_cv_lib_iconv=yes] | ||||
[am_cv_func_iconv=yes]) | [am_cv_func_iconv=yes]) | ||||
LIBS="$am_save_LIBS" | LIBS="$am_save_LIBS" | ||||
@@ -58,16 +66,19 @@ AC_DEFUN([AM_ICONV_LINK], | |||||
]) | ]) | ||||
if test "$am_cv_func_iconv" = yes; then | if test "$am_cv_func_iconv" = yes; then | ||||
AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ | AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ | ||||
dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. | |||||
dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, | |||||
dnl Solaris 10. | |||||
am_save_LIBS="$LIBS" | am_save_LIBS="$LIBS" | ||||
if test $am_cv_lib_iconv = yes; then | if test $am_cv_lib_iconv = yes; then | ||||
LIBS="$LIBS $LIBICONV" | LIBS="$LIBS $LIBICONV" | ||||
fi | fi | ||||
AC_TRY_RUN([ | |||||
AC_RUN_IFELSE( | |||||
[AC_LANG_SOURCE([[ | |||||
#include <iconv.h> | #include <iconv.h> | ||||
#include <string.h> | #include <string.h> | ||||
int main () | int main () | ||||
{ | { | ||||
int result = 0; | |||||
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful | /* Test against AIX 5.1 bug: Failures are not distinguishable from successful | ||||
returns. */ | returns. */ | ||||
{ | { | ||||
@@ -84,7 +95,8 @@ int main () | |||||
(char **) &inptr, &inbytesleft, | (char **) &inptr, &inbytesleft, | ||||
&outptr, &outbytesleft); | &outptr, &outbytesleft); | ||||
if (res == 0) | if (res == 0) | ||||
return 1; | |||||
result |= 1; | |||||
iconv_close (cd_utf8_to_88591); | |||||
} | } | ||||
} | } | ||||
/* Test against Solaris 10 bug: Failures are not distinguishable from | /* Test against Solaris 10 bug: Failures are not distinguishable from | ||||
@@ -103,7 +115,27 @@ int main () | |||||
(char **) &inptr, &inbytesleft, | (char **) &inptr, &inbytesleft, | ||||
&outptr, &outbytesleft); | &outptr, &outbytesleft); | ||||
if (res == 0) | if (res == 0) | ||||
return 1; | |||||
result |= 2; | |||||
iconv_close (cd_ascii_to_88591); | |||||
} | |||||
} | |||||
/* Test against AIX 6.1..7.1 bug: Buffer overrun. */ | |||||
{ | |||||
iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); | |||||
if (cd_88591_to_utf8 != (iconv_t)(-1)) | |||||
{ | |||||
static const char input[] = "\304"; | |||||
static char buf[2] = { (char)0xDE, (char)0xAD }; | |||||
const char *inptr = input; | |||||
size_t inbytesleft = 1; | |||||
char *outptr = buf; | |||||
size_t outbytesleft = 1; | |||||
size_t res = iconv (cd_88591_to_utf8, | |||||
(char **) &inptr, &inbytesleft, | |||||
&outptr, &outbytesleft); | |||||
if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) | |||||
result |= 4; | |||||
iconv_close (cd_88591_to_utf8); | |||||
} | } | ||||
} | } | ||||
#if 0 /* This bug could be worked around by the caller. */ | #if 0 /* This bug could be worked around by the caller. */ | ||||
@@ -122,7 +154,8 @@ int main () | |||||
(char **) &inptr, &inbytesleft, | (char **) &inptr, &inbytesleft, | ||||
&outptr, &outbytesleft); | &outptr, &outbytesleft); | ||||
if ((int)res > 0) | if ((int)res > 0) | ||||
return 1; | |||||
result |= 8; | |||||
iconv_close (cd_88591_to_utf8); | |||||
} | } | ||||
} | } | ||||
#endif | #endif | ||||
@@ -136,13 +169,19 @@ int main () | |||||
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) | && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) | ||||
/* Try HP-UX names. */ | /* Try HP-UX names. */ | ||||
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) | && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) | ||||
return 1; | |||||
return 0; | |||||
}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], | |||||
[case "$host_os" in | |||||
result |= 16; | |||||
return result; | |||||
}]])], | |||||
[am_cv_func_iconv_works=yes], | |||||
[am_cv_func_iconv_works=no], | |||||
[ | |||||
changequote(,)dnl | |||||
case "$host_os" in | |||||
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; | aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; | ||||
*) am_cv_func_iconv_works="guessing yes" ;; | *) am_cv_func_iconv_works="guessing yes" ;; | ||||
esac]) | |||||
esac | |||||
changequote([,])dnl | |||||
]) | |||||
LIBS="$am_save_LIBS" | LIBS="$am_save_LIBS" | ||||
]) | ]) | ||||
case "$am_cv_func_iconv_works" in | case "$am_cv_func_iconv_works" in | ||||
@@ -183,32 +222,47 @@ m4_define([gl_iconv_AC_DEFUN], | |||||
m4_version_prereq([2.64], | m4_version_prereq([2.64], | ||||
[[AC_DEFUN_ONCE( | [[AC_DEFUN_ONCE( | ||||
[$1], [$2])]], | [$1], [$2])]], | ||||
[[AC_DEFUN( | |||||
[$1], [$2])]])) | |||||
[m4_ifdef([gl_00GNULIB], | |||||
[[AC_DEFUN_ONCE( | |||||
[$1], [$2])]], | |||||
[[AC_DEFUN( | |||||
[$1], [$2])]])])) | |||||
gl_iconv_AC_DEFUN([AM_ICONV], | gl_iconv_AC_DEFUN([AM_ICONV], | ||||
[ | [ | ||||
AM_ICONV_LINK | AM_ICONV_LINK | ||||
if test "$am_cv_func_iconv" = yes; then | if test "$am_cv_func_iconv" = yes; then | ||||
AC_MSG_CHECKING([for iconv declaration]) | AC_MSG_CHECKING([for iconv declaration]) | ||||
AC_CACHE_VAL([am_cv_proto_iconv], [ | AC_CACHE_VAL([am_cv_proto_iconv], [ | ||||
AC_TRY_COMPILE([ | |||||
AC_COMPILE_IFELSE( | |||||
[AC_LANG_PROGRAM( | |||||
[[ | |||||
#include <stdlib.h> | #include <stdlib.h> | ||||
#include <iconv.h> | #include <iconv.h> | ||||
extern | extern | ||||
#ifdef __cplusplus | #ifdef __cplusplus | ||||
"C" | "C" | ||||
#endif | #endif | ||||
#if defined(__STDC__) || defined(__cplusplus) | |||||
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) | |||||
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); | size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); | ||||
#else | #else | ||||
size_t iconv(); | size_t iconv(); | ||||
#endif | #endif | ||||
], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) | |||||
]], | |||||
[[]])], | |||||
[am_cv_proto_iconv_arg1=""], | |||||
[am_cv_proto_iconv_arg1="const"]) | |||||
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) | am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) | ||||
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` | am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` | ||||
AC_MSG_RESULT([ | AC_MSG_RESULT([ | ||||
$am_cv_proto_iconv]) | $am_cv_proto_iconv]) | ||||
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], | AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], | ||||
[Define as const if the declaration of iconv() needs const.]) | [Define as const if the declaration of iconv() needs const.]) | ||||
dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>. | |||||
m4_ifdef([gl_ICONV_H_DEFAULTS], | |||||
[AC_REQUIRE([gl_ICONV_H_DEFAULTS]) | |||||
if test -n "$am_cv_proto_iconv_arg1"; then | |||||
ICONV_CONST="const" | |||||
fi | |||||
]) | |||||
fi | fi | ||||
]) | ]) |
@@ -1,50 +1,56 @@ | |||||
# lib-ld.m4 serial 4 (gettext-0.18) | |||||
dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. | |||||
# lib-ld.m4 serial 6 | |||||
dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
dnl Subroutines of libtool.m4, | dnl Subroutines of libtool.m4, | ||||
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision | |||||
dnl with libtool.m4. | |||||
dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid | |||||
dnl collision with libtool.m4. | |||||
dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. | |||||
dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. | |||||
AC_DEFUN([AC_LIB_PROG_LD_GNU], | AC_DEFUN([AC_LIB_PROG_LD_GNU], | ||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], | [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], | ||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v. | |||||
[# I'd rather use --version here, but apparently some GNU lds only accept -v. | |||||
case `$LD -v 2>&1 </dev/null` in | case `$LD -v 2>&1 </dev/null` in | ||||
*GNU* | *'with BFD'*) | *GNU* | *'with BFD'*) | ||||
acl_cv_prog_gnu_ld=yes ;; | |||||
acl_cv_prog_gnu_ld=yes | |||||
;; | |||||
*) | *) | ||||
acl_cv_prog_gnu_ld=no ;; | |||||
acl_cv_prog_gnu_ld=no | |||||
;; | |||||
esac]) | esac]) | ||||
with_gnu_ld=$acl_cv_prog_gnu_ld | with_gnu_ld=$acl_cv_prog_gnu_ld | ||||
]) | ]) | ||||
dnl From libtool-1.4. Sets the variable LD. | |||||
dnl From libtool-2.4. Sets the variable LD. | |||||
AC_DEFUN([AC_LIB_PROG_LD], | AC_DEFUN([AC_LIB_PROG_LD], | ||||
[AC_ARG_WITH([gnu-ld], | |||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], | |||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) | |||||
AC_REQUIRE([AC_PROG_CC])dnl | |||||
[AC_REQUIRE([AC_PROG_CC])dnl | |||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl | AC_REQUIRE([AC_CANONICAL_HOST])dnl | ||||
AC_ARG_WITH([gnu-ld], | |||||
[AS_HELP_STRING([--with-gnu-ld], | |||||
[assume the C compiler uses GNU ld [default=no]])], | |||||
[test "$withval" = no || with_gnu_ld=yes], | |||||
[with_gnu_ld=no])dnl | |||||
# Prepare PATH_SEPARATOR. | # Prepare PATH_SEPARATOR. | ||||
# The user is always right. | # The user is always right. | ||||
if test "${PATH_SEPARATOR+set}" != set; then | if test "${PATH_SEPARATOR+set}" != set; then | ||||
echo "#! /bin/sh" >conf$$.sh | |||||
echo "exit 0" >>conf$$.sh | |||||
chmod +x conf$$.sh | |||||
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |||||
PATH_SEPARATOR=';' | |||||
else | |||||
PATH_SEPARATOR=: | |||||
fi | |||||
rm -f conf$$.sh | |||||
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which | |||||
# contains only /bin. Note that ksh looks also at the FPATH variable, | |||||
# so we have to set that as well for the test. | |||||
PATH_SEPARATOR=: | |||||
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ | |||||
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ | |||||
|| PATH_SEPARATOR=';' | |||||
} | |||||
fi | fi | ||||
ac_prog=ld | ac_prog=ld | ||||
if test "$GCC" = yes; then | if test "$GCC" = yes; then | ||||
# Check if gcc -print-prog-name=ld gives a path. | # Check if gcc -print-prog-name=ld gives a path. | ||||
AC_MSG_CHECKING([for ld used by GCC]) | |||||
AC_MSG_CHECKING([for ld used by $CC]) | |||||
case $host in | case $host in | ||||
*-*-mingw*) | *-*-mingw*) | ||||
# gcc leaves a trailing carriage return which upsets mingw | # gcc leaves a trailing carriage return which upsets mingw | ||||
@@ -54,11 +60,11 @@ if test "$GCC" = yes; then | |||||
esac | esac | ||||
case $ac_prog in | case $ac_prog in | ||||
# Accept absolute paths. | # Accept absolute paths. | ||||
[[\\/]* | [A-Za-z]:[\\/]*)] | |||||
[re_direlt='/[^/][^/]*/\.\./'] | |||||
# Canonicalize the path of ld | |||||
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` | |||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do | |||||
[[\\/]]* | ?:[[\\/]]*) | |||||
re_direlt='/[[^/]][[^/]]*/\.\./' | |||||
# Canonicalize the pathname of ld | |||||
ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` | |||||
while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do | |||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` | ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` | ||||
done | done | ||||
test -z "$LD" && LD="$ac_prog" | test -z "$LD" && LD="$ac_prog" | ||||
@@ -79,23 +85,26 @@ else | |||||
fi | fi | ||||
AC_CACHE_VAL([acl_cv_path_LD], | AC_CACHE_VAL([acl_cv_path_LD], | ||||
[if test -z "$LD"; then | [if test -z "$LD"; then | ||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" | |||||
acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR | |||||
for ac_dir in $PATH; do | for ac_dir in $PATH; do | ||||
IFS="$acl_save_ifs" | |||||
test -z "$ac_dir" && ac_dir=. | test -z "$ac_dir" && ac_dir=. | ||||
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then | if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then | ||||
acl_cv_path_LD="$ac_dir/$ac_prog" | acl_cv_path_LD="$ac_dir/$ac_prog" | ||||
# Check to see if the program is GNU ld. I'd rather use --version, | # Check to see if the program is GNU ld. I'd rather use --version, | ||||
# but apparently some GNU ld's only accept -v. | |||||
# but apparently some variants of GNU ld only accept -v. | |||||
# Break only if it was the GNU/non-GNU ld that we prefer. | # Break only if it was the GNU/non-GNU ld that we prefer. | ||||
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in | |||||
case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in | |||||
*GNU* | *'with BFD'*) | *GNU* | *'with BFD'*) | ||||
test "$with_gnu_ld" != no && break ;; | |||||
test "$with_gnu_ld" != no && break | |||||
;; | |||||
*) | *) | ||||
test "$with_gnu_ld" != yes && break ;; | |||||
test "$with_gnu_ld" != yes && break | |||||
;; | |||||
esac | esac | ||||
fi | fi | ||||
done | done | ||||
IFS="$ac_save_ifs" | |||||
IFS="$acl_save_ifs" | |||||
else | else | ||||
acl_cv_path_LD="$LD" # Let the user override the test with a path. | acl_cv_path_LD="$LD" # Let the user override the test with a path. | ||||
fi]) | fi]) | ||||
@@ -1,5 +1,5 @@ | |||||
# lib-link.m4 serial 21 (gettext-0.18) | |||||
dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. | |||||
# lib-link.m4 serial 26 (gettext-0.18.2) | |||||
dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
@@ -18,9 +18,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS], | |||||
[ | [ | ||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||||
AC_REQUIRE([AC_LIB_RPATH]) | AC_REQUIRE([AC_LIB_RPATH]) | ||||
pushdef([Name],[translit([$1],[./-], [___])]) | |||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | |||||
pushdef([Name],[m4_translit([$1],[./+-], [____])]) | |||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) | |||||
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ | AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ | ||||
AC_LIB_LINKFLAGS_BODY([$1], [$2]) | AC_LIB_LINKFLAGS_BODY([$1], [$2]) | ||||
ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ac_cv_lib[]Name[]_libs="$LIB[]NAME" | ||||
@@ -58,9 +58,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | |||||
[ | [ | ||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) | ||||
AC_REQUIRE([AC_LIB_RPATH]) | AC_REQUIRE([AC_LIB_RPATH]) | ||||
pushdef([Name],[translit([$1],[./-], [___])]) | |||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | |||||
pushdef([Name],[m4_translit([$1],[./+-], [____])]) | |||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) | |||||
dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME | dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME | ||||
dnl accordingly. | dnl accordingly. | ||||
@@ -68,7 +68,7 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | |||||
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, | dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, | ||||
dnl because if the user has installed lib[]Name and not disabled its use | dnl because if the user has installed lib[]Name and not disabled its use | ||||
dnl via --without-lib[]Name-prefix, he wants to use it. | |||||
dnl via --without-lib[]Name-prefix, they want to use it. | |||||
ac_save_CPPFLAGS="$CPPFLAGS" | ac_save_CPPFLAGS="$CPPFLAGS" | ||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) | ||||
@@ -85,7 +85,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | |||||
*" -l"*) LIBS="$LIBS $LIB[]NAME" ;; | *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; | ||||
*) LIBS="$LIB[]NAME $LIBS" ;; | *) LIBS="$LIB[]NAME $LIBS" ;; | ||||
esac | esac | ||||
AC_TRY_LINK([$3], [$4], | |||||
AC_LINK_IFELSE( | |||||
[AC_LANG_PROGRAM([[$3]], [[$4]])], | |||||
[ac_cv_lib[]Name=yes], | [ac_cv_lib[]Name=yes], | ||||
[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) | [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) | ||||
LIBS="$ac_save_LIBS" | LIBS="$ac_save_LIBS" | ||||
@@ -115,6 +116,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], | |||||
dnl Determine the platform dependent parameters needed to use rpath: | dnl Determine the platform dependent parameters needed to use rpath: | ||||
dnl acl_libext, | dnl acl_libext, | ||||
dnl acl_shlibext, | dnl acl_shlibext, | ||||
dnl acl_libname_spec, | |||||
dnl acl_library_names_spec, | |||||
dnl acl_hardcode_libdir_flag_spec, | dnl acl_hardcode_libdir_flag_spec, | ||||
dnl acl_hardcode_libdir_separator, | dnl acl_hardcode_libdir_separator, | ||||
dnl acl_hardcode_direct, | dnl acl_hardcode_direct, | ||||
@@ -157,15 +160,15 @@ dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar | |||||
dnl macro call that searches for libname. | dnl macro call that searches for libname. | ||||
AC_DEFUN([AC_LIB_FROMPACKAGE], | AC_DEFUN([AC_LIB_FROMPACKAGE], | ||||
[ | [ | ||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | |||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) | |||||
define([acl_frompackage_]NAME, [$2]) | define([acl_frompackage_]NAME, [$2]) | ||||
popdef([NAME]) | popdef([NAME]) | ||||
pushdef([PACK],[$2]) | pushdef([PACK],[$2]) | ||||
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | |||||
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) | |||||
define([acl_libsinpackage_]PACKUP, | define([acl_libsinpackage_]PACKUP, | ||||
m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) | |||||
m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) | |||||
popdef([PACKUP]) | popdef([PACKUP]) | ||||
popdef([PACK]) | popdef([PACK]) | ||||
]) | ]) | ||||
@@ -178,14 +181,14 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. | |||||
AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | ||||
[ | [ | ||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) | ||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | |||||
pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) | |||||
pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) | pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) | ||||
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) | |||||
pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], | |||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) | |||||
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) | pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) | ||||
dnl Autoconf >= 2.61 supports dots in --with options. | dnl Autoconf >= 2.61 supports dots in --with options. | ||||
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) | |||||
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) | |||||
dnl By default, look in $includedir and $libdir. | dnl By default, look in $includedir and $libdir. | ||||
use_additional=yes | use_additional=yes | ||||
AC_LIB_WITH_FINAL_PREFIX([ | AC_LIB_WITH_FINAL_PREFIX([ | ||||
@@ -242,7 +245,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], | |||||
names_already_handled="$names_already_handled $name" | names_already_handled="$names_already_handled $name" | ||||
dnl See if it was already located by an earlier AC_LIB_LINKFLAGS | dnl See if it was already located by an earlier AC_LIB_LINKFLAGS | ||||
dnl or AC_LIB_HAVE_LINKFLAGS call. | dnl or AC_LIB_HAVE_LINKFLAGS call. | ||||
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` | |||||
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` | |||||
eval value=\"\$HAVE_LIB$uppername\" | eval value=\"\$HAVE_LIB$uppername\" | ||||
if test -n "$value"; then | if test -n "$value"; then | ||||
if test "$value" = yes; then | if test "$value" = yes; then | ||||
@@ -1,5 +1,5 @@ | |||||
# lib-prefix.m4 serial 7 (gettext-0.18) | # lib-prefix.m4 serial 7 (gettext-0.18) | ||||
dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. | |||||
dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
@@ -15,7 +15,7 @@ ifdef([AC_HELP_STRING], | |||||
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed | dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed | ||||
dnl to access previously installed libraries. The basic assumption is that | dnl to access previously installed libraries. The basic assumption is that | ||||
dnl a user will want packages to use other packages he previously installed | |||||
dnl a user will want packages to use other packages they previously installed | |||||
dnl with the same --prefix option. | dnl with the same --prefix option. | ||||
dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate | dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate | ||||
dnl libraries, but is otherwise very convenient. | dnl libraries, but is otherwise very convenient. | ||||
@@ -4063,7 +4063,8 @@ _LT_EOF | |||||
if AC_TRY_EVAL(ac_compile); then | if AC_TRY_EVAL(ac_compile); then | ||||
# Now try to grab the symbols. | # Now try to grab the symbols. | ||||
nlist=conftest.nm | nlist=conftest.nm | ||||
if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then | |||||
$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD | |||||
if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then | |||||
# Try sorting and uniquifying the output. | # Try sorting and uniquifying the output. | ||||
if sort "$nlist" | uniq > "$nlist"T; then | if sort "$nlist" | uniq > "$nlist"T; then | ||||
mv -f "$nlist"T "$nlist" | mv -f "$nlist"T "$nlist" | ||||
@@ -6438,7 +6439,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||||
# Commands to make compiler produce verbose output that lists | # Commands to make compiler produce verbose output that lists | ||||
# what "hidden" libraries, object files and flags are used when | # what "hidden" libraries, object files and flags are used when | ||||
# linking a shared library. | # linking a shared library. | ||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | |||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | |||||
else | else | ||||
GXX=no | GXX=no | ||||
@@ -6813,7 +6814,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||||
# explicitly linking system object files so we need to strip them | # explicitly linking system object files so we need to strip them | ||||
# from the output so that they don't get included in the library | # from the output so that they don't get included in the library | ||||
# dependencies. | # dependencies. | ||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | |||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | |||||
;; | ;; | ||||
*) | *) | ||||
if test yes = "$GXX"; then | if test yes = "$GXX"; then | ||||
@@ -6878,7 +6879,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||||
# explicitly linking system object files so we need to strip them | # explicitly linking system object files so we need to strip them | ||||
# from the output so that they don't get included in the library | # from the output so that they don't get included in the library | ||||
# dependencies. | # dependencies. | ||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | |||||
output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' | |||||
;; | ;; | ||||
*) | *) | ||||
if test yes = "$GXX"; then | if test yes = "$GXX"; then | ||||
@@ -7217,7 +7218,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||||
# Commands to make compiler produce verbose output that lists | # Commands to make compiler produce verbose output that lists | ||||
# what "hidden" libraries, object files and flags are used when | # what "hidden" libraries, object files and flags are used when | ||||
# linking a shared library. | # linking a shared library. | ||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | |||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | |||||
else | else | ||||
# FIXME: insert proper C++ library support | # FIXME: insert proper C++ library support | ||||
@@ -7301,7 +7302,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||||
# Commands to make compiler produce verbose output that lists | # Commands to make compiler produce verbose output that lists | ||||
# what "hidden" libraries, object files and flags are used when | # what "hidden" libraries, object files and flags are used when | ||||
# linking a shared library. | # linking a shared library. | ||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | |||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | |||||
else | else | ||||
# g++ 2.7 appears to require '-G' NOT '-shared' on this | # g++ 2.7 appears to require '-G' NOT '-shared' on this | ||||
# platform. | # platform. | ||||
@@ -7312,7 +7313,7 @@ if test yes != "$_lt_caught_CXX_error"; then | |||||
# Commands to make compiler produce verbose output that lists | # Commands to make compiler produce verbose output that lists | ||||
# what "hidden" libraries, object files and flags are used when | # what "hidden" libraries, object files and flags are used when | ||||
# linking a shared library. | # linking a shared library. | ||||
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' | |||||
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' | |||||
fi | fi | ||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' | _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' | ||||
@@ -1,5 +1,5 @@ | |||||
# nls.m4 serial 5 (gettext-0.18) | # nls.m4 serial 5 (gettext-0.18) | ||||
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, | |||||
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, | |||||
dnl Inc. | dnl Inc. | ||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
@@ -1,57 +1,275 @@ | |||||
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | |||||
dnl serial 11 (pkg-config-0.29) | |||||
dnl | |||||
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>. | |||||
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com> | |||||
dnl | |||||
dnl This program is free software; you can redistribute it and/or modify | |||||
dnl it under the terms of the GNU General Public License as published by | |||||
dnl the Free Software Foundation; either version 2 of the License, or | |||||
dnl (at your option) any later version. | |||||
dnl | |||||
dnl This program is distributed in the hope that it will be useful, but | |||||
dnl WITHOUT ANY WARRANTY; without even the implied warranty of | |||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||||
dnl General Public License for more details. | |||||
dnl | |||||
dnl You should have received a copy of the GNU General Public License | |||||
dnl along with this program; if not, write to the Free Software | |||||
dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | |||||
dnl 02111-1307, USA. | |||||
dnl | |||||
dnl As a special exception to the GNU General Public License, if you | |||||
dnl distribute this file as part of a program that contains a | |||||
dnl configuration script generated by Autoconf, you may include it under | |||||
dnl the same distribution terms that you use for the rest of that | |||||
dnl program. | |||||
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) | |||||
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page | |||||
dnl also defines GSTUFF_PKG_ERRORS on error | |||||
AC_DEFUN([PKG_CHECK_MODULES], [ | |||||
succeeded=no | |||||
if test -z "$PKG_CONFIG"; then | |||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no) | |||||
fi | |||||
if test "$PKG_CONFIG" = "no" ; then | |||||
echo "*** The pkg-config script could not be found. Make sure it is" | |||||
echo "*** in your path, or set the PKG_CONFIG environment variable" | |||||
echo "*** to the full path to pkg-config." | |||||
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." | |||||
else | |||||
PKG_CONFIG_MIN_VERSION=0.9.0 | |||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | |||||
AC_MSG_CHECKING(for $2) | |||||
if $PKG_CONFIG --exists "$2" ; then | |||||
AC_MSG_RESULT(yes) | |||||
succeeded=yes | |||||
AC_MSG_CHECKING($1_CFLAGS) | |||||
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"` | |||||
AC_MSG_RESULT($$1_CFLAGS) | |||||
AC_MSG_CHECKING($1_LIBS) | |||||
$1_LIBS=`$PKG_CONFIG --libs "$2"` | |||||
AC_MSG_RESULT($$1_LIBS) | |||||
else | |||||
$1_CFLAGS="" | |||||
$1_LIBS="" | |||||
## If we have a custom action on failure, don't print errors, but | |||||
## do set a variable so people can do so. | |||||
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` | |||||
ifelse([$4], ,echo $$1_PKG_ERRORS,) | |||||
dnl PKG_PREREQ(MIN-VERSION) | |||||
dnl ----------------------- | |||||
dnl Since: 0.29 | |||||
dnl | |||||
dnl Verify that the version of the pkg-config macros are at least | |||||
dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's | |||||
dnl installed version of pkg-config, this checks the developer's version | |||||
dnl of pkg.m4 when generating configure. | |||||
dnl | |||||
dnl To ensure that this macro is defined, also add: | |||||
dnl m4_ifndef([PKG_PREREQ], | |||||
dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) | |||||
dnl | |||||
dnl See the "Since" comment for each macro you use to see what version | |||||
dnl of the macros you require. | |||||
m4_defun([PKG_PREREQ], | |||||
[m4_define([PKG_MACROS_VERSION], [0.29]) | |||||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | |||||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | |||||
])dnl PKG_PREREQ | |||||
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) | |||||
dnl ---------------------------------- | |||||
dnl Since: 0.16 | |||||
dnl | |||||
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to | |||||
dnl first found in the path. Checks that the version of pkg-config found | |||||
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is | |||||
dnl used since that's the first version where most current features of | |||||
dnl pkg-config existed. | |||||
AC_DEFUN([PKG_PROG_PKG_CONFIG], | |||||
[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | |||||
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) | |||||
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) | |||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | |||||
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | |||||
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | |||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | |||||
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | |||||
fi | |||||
if test -n "$PKG_CONFIG"; then | |||||
_pkg_min_version=m4_default([$1], [0.9.0]) | |||||
AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) | |||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | |||||
AC_MSG_RESULT([yes]) | |||||
else | |||||
AC_MSG_RESULT([no]) | |||||
PKG_CONFIG="" | |||||
fi | |||||
fi[]dnl | |||||
])dnl PKG_PROG_PKG_CONFIG | |||||
dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | |||||
dnl ------------------------------------------------------------------- | |||||
dnl Since: 0.18 | |||||
dnl | |||||
dnl Check to see whether a particular set of modules exists. Similar to | |||||
dnl PKG_CHECK_MODULES(), but does not set variables or print errors. | |||||
dnl | |||||
dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | |||||
dnl only at the first occurence in configure.ac, so if the first place | |||||
dnl it's called might be skipped (such as if it is within an "if", you | |||||
dnl have to call PKG_CHECK_EXISTS manually | |||||
AC_DEFUN([PKG_CHECK_EXISTS], | |||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | |||||
if test -n "$PKG_CONFIG" && \ | |||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | |||||
m4_default([$2], [:]) | |||||
m4_ifvaln([$3], [else | |||||
$3])dnl | |||||
fi]) | |||||
dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) | |||||
dnl --------------------------------------------- | |||||
dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting | |||||
dnl pkg_failed based on the result. | |||||
m4_define([_PKG_CONFIG], | |||||
[if test -n "$$1"; then | |||||
pkg_cv_[]$1="$$1" | |||||
elif test -n "$PKG_CONFIG"; then | |||||
PKG_CHECK_EXISTS([$3], | |||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` | |||||
test "x$?" != "x0" && pkg_failed=yes ], | |||||
[pkg_failed=yes]) | |||||
else | |||||
pkg_failed=untried | |||||
fi[]dnl | |||||
])dnl _PKG_CONFIG | |||||
dnl _PKG_SHORT_ERRORS_SUPPORTED | |||||
dnl --------------------------- | |||||
dnl Internal check to see if pkg-config supports short errors. | |||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], | |||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) | |||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | |||||
_pkg_short_errors_supported=yes | |||||
else | |||||
_pkg_short_errors_supported=no | |||||
fi[]dnl | |||||
])dnl _PKG_SHORT_ERRORS_SUPPORTED | |||||
dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], | |||||
dnl [ACTION-IF-NOT-FOUND]) | |||||
dnl -------------------------------------------------------------- | |||||
dnl Since: 0.4.0 | |||||
dnl | |||||
dnl Note that if there is a possibility the first call to | |||||
dnl PKG_CHECK_MODULES might not happen, you should be sure to include an | |||||
dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac | |||||
AC_DEFUN([PKG_CHECK_MODULES], | |||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | |||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl | |||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl | |||||
pkg_failed=no | |||||
AC_MSG_CHECKING([for $1]) | |||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) | |||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2]) | |||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS | |||||
and $1[]_LIBS to avoid the need to call pkg-config. | |||||
See the pkg-config man page for more details.]) | |||||
if test $pkg_failed = yes; then | |||||
AC_MSG_RESULT([no]) | |||||
_PKG_SHORT_ERRORS_SUPPORTED | |||||
if test $_pkg_short_errors_supported = yes; then | |||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` | |||||
else | |||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` | |||||
fi | fi | ||||
# Put the nasty error message in config.log where it belongs | |||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD | |||||
m4_default([$4], [AC_MSG_ERROR( | |||||
[Package requirements ($2) were not met: | |||||
$$1_PKG_ERRORS | |||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you | |||||
installed software in a non-standard prefix. | |||||
_PKG_TEXT])[]dnl | |||||
]) | |||||
elif test $pkg_failed = untried; then | |||||
AC_MSG_RESULT([no]) | |||||
m4_default([$4], [AC_MSG_FAILURE( | |||||
[The pkg-config script could not be found or is too old. Make sure it | |||||
is in your PATH or set the PKG_CONFIG environment variable to the full | |||||
path to pkg-config. | |||||
_PKG_TEXT | |||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl | |||||
]) | |||||
else | |||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS | |||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS | |||||
AC_MSG_RESULT([yes]) | |||||
$3 | |||||
fi[]dnl | |||||
])dnl PKG_CHECK_MODULES | |||||
dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], | |||||
dnl [ACTION-IF-NOT-FOUND]) | |||||
dnl --------------------------------------------------------------------- | |||||
dnl Since: 0.29 | |||||
dnl | |||||
dnl Checks for existence of MODULES and gathers its build flags with | |||||
dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags | |||||
dnl and VARIABLE-PREFIX_LIBS from --libs. | |||||
dnl | |||||
dnl Note that if there is a possibility the first call to | |||||
dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to | |||||
dnl include an explicit call to PKG_PROG_PKG_CONFIG in your | |||||
dnl configure.ac. | |||||
AC_DEFUN([PKG_CHECK_MODULES_STATIC], | |||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | |||||
_save_PKG_CONFIG=$PKG_CONFIG | |||||
PKG_CONFIG="$PKG_CONFIG --static" | |||||
PKG_CHECK_MODULES($@) | |||||
PKG_CONFIG=$_save_PKG_CONFIG[]dnl | |||||
])dnl PKG_CHECK_MODULES_STATIC | |||||
dnl PKG_INSTALLDIR([DIRECTORY]) | |||||
dnl ------------------------- | |||||
dnl Since: 0.27 | |||||
dnl | |||||
dnl Substitutes the variable pkgconfigdir as the location where a module | |||||
dnl should install pkg-config .pc files. By default the directory is | |||||
dnl $libdir/pkgconfig, but the default can be changed by passing | |||||
dnl DIRECTORY. The user can override through the --with-pkgconfigdir | |||||
dnl parameter. | |||||
AC_DEFUN([PKG_INSTALLDIR], | |||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) | |||||
m4_pushdef([pkg_description], | |||||
[pkg-config installation directory @<:@]pkg_default[@:>@]) | |||||
AC_ARG_WITH([pkgconfigdir], | |||||
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, | |||||
[with_pkgconfigdir=]pkg_default) | |||||
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) | |||||
m4_popdef([pkg_default]) | |||||
m4_popdef([pkg_description]) | |||||
])dnl PKG_INSTALLDIR | |||||
dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) | |||||
dnl -------------------------------- | |||||
dnl Since: 0.27 | |||||
dnl | |||||
dnl Substitutes the variable noarch_pkgconfigdir as the location where a | |||||
dnl module should install arch-independent pkg-config .pc files. By | |||||
dnl default the directory is $datadir/pkgconfig, but the default can be | |||||
dnl changed by passing DIRECTORY. The user can override through the | |||||
dnl --with-noarch-pkgconfigdir parameter. | |||||
AC_DEFUN([PKG_NOARCH_INSTALLDIR], | |||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) | |||||
m4_pushdef([pkg_description], | |||||
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) | |||||
AC_ARG_WITH([noarch-pkgconfigdir], | |||||
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, | |||||
[with_noarch_pkgconfigdir=]pkg_default) | |||||
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) | |||||
m4_popdef([pkg_default]) | |||||
m4_popdef([pkg_description]) | |||||
])dnl PKG_NOARCH_INSTALLDIR | |||||
AC_SUBST($1_CFLAGS) | |||||
AC_SUBST($1_LIBS) | |||||
else | |||||
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." | |||||
echo "*** See http://www.freedesktop.org/software/pkgconfig" | |||||
fi | |||||
fi | |||||
if test $succeeded = yes; then | |||||
ifelse([$3], , :, [$3]) | |||||
else | |||||
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) | |||||
fi | |||||
]) | |||||
dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, | |||||
dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | |||||
dnl ------------------------------------------- | |||||
dnl Since: 0.28 | |||||
dnl | |||||
dnl Retrieves the value of the pkg-config variable for the given module. | |||||
AC_DEFUN([PKG_CHECK_VAR], | |||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | |||||
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | |||||
_PKG_CONFIG([$1], [variable="][$3]["], [$2]) | |||||
AS_VAR_COPY([$1], [pkg_cv_][$1]) | |||||
AS_VAR_IF([$1], [""], [$5], [$4])dnl | |||||
])dnl PKG_CHECK_VAR |
@@ -1,5 +1,5 @@ | |||||
# po.m4 serial 17 (gettext-0.18) | |||||
dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. | |||||
# po.m4 serial 21 (gettext-0.18.3) | |||||
dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
@@ -17,14 +17,15 @@ dnl Authors: | |||||
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. | ||||
dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | ||||
AC_PREREQ([2.50]) | |||||
AC_PREREQ([2.60]) | |||||
dnl Checks for all prerequisites of the po subdirectory. | dnl Checks for all prerequisites of the po subdirectory. | ||||
AC_DEFUN([AM_PO_SUBDIRS], | AC_DEFUN([AM_PO_SUBDIRS], | ||||
[ | [ | ||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | ||||
AC_REQUIRE([AC_PROG_INSTALL])dnl | AC_REQUIRE([AC_PROG_INSTALL])dnl | ||||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | |||||
AC_REQUIRE([AC_PROG_MKDIR_P])dnl | |||||
AC_REQUIRE([AC_PROG_SED])dnl | |||||
AC_REQUIRE([AM_NLS])dnl | AC_REQUIRE([AM_NLS])dnl | ||||
dnl Release version of the gettext macros. This is used to ensure that | dnl Release version of the gettext macros. This is used to ensure that | ||||
@@ -102,7 +103,7 @@ changequote([,])dnl | |||||
case "$ac_file" in */Makefile.in) | case "$ac_file" in */Makefile.in) | ||||
# Adjust a relative srcdir. | # Adjust a relative srcdir. | ||||
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ||||
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" | |||||
ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` | |||||
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | ||||
# In autoconf-2.13 it is called $ac_given_srcdir. | # In autoconf-2.13 it is called $ac_given_srcdir. | ||||
# In autoconf-2.50 it is called $srcdir. | # In autoconf-2.50 it is called $srcdir. | ||||
@@ -118,7 +119,8 @@ changequote([,])dnl | |||||
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then | if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then | ||||
rm -f "$ac_dir/POTFILES" | rm -f "$ac_dir/POTFILES" | ||||
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" | test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" | ||||
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" | |||||
gt_tab=`printf '\t'` | |||||
cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" | |||||
POMAKEFILEDEPS="POTFILES.in" | POMAKEFILEDEPS="POTFILES.in" | ||||
# ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend | # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend | ||||
# on $ac_dir but don't depend on user-specified configuration | # on $ac_dir but don't depend on user-specified configuration | ||||
@@ -129,12 +131,12 @@ changequote([,])dnl | |||||
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" | test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" | ||||
fi | fi | ||||
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` | ||||
# Hide the ALL_LINGUAS assigment from automake < 1.5. | |||||
# Hide the ALL_LINGUAS assignment from automake < 1.5. | |||||
eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | ||||
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" | ||||
else | else | ||||
# The set of available languages was given in configure.in. | # The set of available languages was given in configure.in. | ||||
# Hide the ALL_LINGUAS assigment from automake < 1.5. | |||||
# Hide the ALL_LINGUAS assignment from automake < 1.5. | |||||
eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' | eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' | ||||
fi | fi | ||||
# Compute POFILES | # Compute POFILES | ||||
@@ -226,7 +228,7 @@ AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], | |||||
changequote(,)dnl | changequote(,)dnl | ||||
# Adjust a relative srcdir. | # Adjust a relative srcdir. | ||||
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ||||
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" | |||||
ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` | |||||
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` | ||||
# In autoconf-2.13 it is called $ac_given_srcdir. | # In autoconf-2.13 it is called $ac_given_srcdir. | ||||
# In autoconf-2.50 it is called $srcdir. | # In autoconf-2.50 it is called $srcdir. | ||||
@@ -254,6 +256,7 @@ EOT | |||||
fi | fi | ||||
# A sed script that extracts the value of VARIABLE from a Makefile. | # A sed script that extracts the value of VARIABLE from a Makefile. | ||||
tab=`printf '\t'` | |||||
sed_x_variable=' | sed_x_variable=' | ||||
# Test if the hold space is empty. | # Test if the hold space is empty. | ||||
x | x | ||||
@@ -261,9 +264,9 @@ s/P/P/ | |||||
x | x | ||||
ta | ta | ||||
# Yes it was empty. Look if we have the expected variable definition. | # Yes it was empty. Look if we have the expected variable definition. | ||||
/^[ ]*VARIABLE[ ]*=/{ | |||||
/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ | |||||
# Seen the first line of the variable definition. | # Seen the first line of the variable definition. | ||||
s/^[ ]*VARIABLE[ ]*=// | |||||
s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// | |||||
ba | ba | ||||
} | } | ||||
bd | bd | ||||
@@ -315,7 +318,7 @@ changequote([,])dnl | |||||
sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` | sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` | ||||
ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` | ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` | ||||
fi | fi | ||||
# Hide the ALL_LINGUAS assigment from automake < 1.5. | |||||
# Hide the ALL_LINGUAS assignment from automake < 1.5. | |||||
eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | eval 'ALL_LINGUAS''=$ALL_LINGUAS_' | ||||
# Compute POFILES | # Compute POFILES | ||||
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) | ||||
@@ -405,14 +408,15 @@ changequote([,])dnl | |||||
fi | fi | ||||
sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" | sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" | ||||
tab=`printf '\t'` | |||||
if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then | if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then | ||||
# Add dependencies that cannot be formulated as a simple suffix rule. | # Add dependencies that cannot be formulated as a simple suffix rule. | ||||
for lang in $ALL_LINGUAS; do | for lang in $ALL_LINGUAS; do | ||||
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | ||||
cat >> "$ac_file.tmp" <<EOF | cat >> "$ac_file.tmp" <<EOF | ||||
$frobbedlang.msg: $lang.po | $frobbedlang.msg: $lang.po | ||||
@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ | |||||
\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | |||||
${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \ | |||||
${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | |||||
EOF | EOF | ||||
done | done | ||||
fi | fi | ||||
@@ -422,8 +426,8 @@ EOF | |||||
frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` | frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` | ||||
cat >> "$ac_file.tmp" <<EOF | cat >> "$ac_file.tmp" <<EOF | ||||
$frobbedlang/\$(DOMAIN).resources.dll: $lang.po | $frobbedlang/\$(DOMAIN).resources.dll: $lang.po | ||||
@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ | |||||
\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | |||||
${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \ | |||||
${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; } | |||||
EOF | EOF | ||||
done | done | ||||
fi | fi | ||||
@@ -1,5 +1,5 @@ | |||||
# progtest.m4 serial 6 (gettext-0.18) | |||||
dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. | |||||
# progtest.m4 serial 7 (gettext-0.18.2) | |||||
dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc. | |||||
dnl This file is free software; the Free Software Foundation | dnl This file is free software; the Free Software Foundation | ||||
dnl gives unlimited permission to copy and/or distribute it, | dnl gives unlimited permission to copy and/or distribute it, | ||||
dnl with or without modifications, as long as this notice is preserved. | dnl with or without modifications, as long as this notice is preserved. | ||||
@@ -27,15 +27,14 @@ AC_DEFUN([AM_PATH_PROG_WITH_TEST], | |||||
# Prepare PATH_SEPARATOR. | # Prepare PATH_SEPARATOR. | ||||
# The user is always right. | # The user is always right. | ||||
if test "${PATH_SEPARATOR+set}" != set; then | if test "${PATH_SEPARATOR+set}" != set; then | ||||
echo "#! /bin/sh" >conf$$.sh | |||||
echo "exit 0" >>conf$$.sh | |||||
chmod +x conf$$.sh | |||||
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then | |||||
PATH_SEPARATOR=';' | |||||
else | |||||
PATH_SEPARATOR=: | |||||
fi | |||||
rm -f conf$$.sh | |||||
# Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which | |||||
# contains only /bin. Note that ksh looks also at the FPATH variable, | |||||
# so we have to set that as well for the test. | |||||
PATH_SEPARATOR=: | |||||
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ | |||||
&& { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ | |||||
|| PATH_SEPARATOR=';' | |||||
} | |||||
fi | fi | ||||
# Find out how to test for executable files. Don't use a zero-byte file, | # Find out how to test for executable files. Don't use a zero-byte file, | ||||