diff options
author | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-02-12 11:07:18 +0000 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net> | 2008-02-12 11:07:18 +0000 |
commit | bd7029a99b0c2974265c6665638ef14a052f42ab (patch) | |
tree | f5661ba73366d81ef6e91f889ea7fec5ebe07b6b /gl/m4/intl.m4 | |
parent | f99612320d6eda67644c07be04bb21aa4d7789db (diff) | |
download | monitoring-plugins-bd7029a99b0c2974265c6665638ef14a052f42ab.tar.gz |
Sync to latest Gnulib
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1925 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'gl/m4/intl.m4')
-rw-r--r-- | gl/m4/intl.m4 | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/gl/m4/intl.m4 b/gl/m4/intl.m4 index dcefb118..934408bb 100644 --- a/gl/m4/intl.m4 +++ b/gl/m4/intl.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # intl.m4 serial 3 (gettext-0.16) | 1 | # intl.m4 serial 8 (gettext-0.17) |
2 | dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. |
3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |
@@ -33,7 +33,6 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
33 | AC_REQUIRE([gl_VISIBILITY])dnl | 33 | AC_REQUIRE([gl_VISIBILITY])dnl |
34 | AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl | 34 | AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl |
35 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl | 35 | AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl |
36 | AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl | ||
37 | AC_REQUIRE([gt_TYPE_WCHAR_T])dnl | 36 | AC_REQUIRE([gt_TYPE_WCHAR_T])dnl |
38 | AC_REQUIRE([gt_TYPE_WINT_T])dnl | 37 | AC_REQUIRE([gt_TYPE_WINT_T])dnl |
39 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) | 38 | AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) |
@@ -98,7 +97,7 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
98 | dnl exported variables _also_ in the static library. | 97 | dnl exported variables _also_ in the static library. |
99 | if test "$enable_shared" = yes; then | 98 | if test "$enable_shared" = yes; then |
100 | case "$host_os" in | 99 | case "$host_os" in |
101 | cygwin*) is_woe32dll=yes ;; | 100 | mingw* | cygwin*) is_woe32dll=yes ;; |
102 | *) is_woe32dll=no ;; | 101 | *) is_woe32dll=no ;; |
103 | esac | 102 | esac |
104 | else | 103 | else |
@@ -107,6 +106,31 @@ AC_DEFUN([AM_INTL_SUBDIR], | |||
107 | WOE32DLL=$is_woe32dll | 106 | WOE32DLL=$is_woe32dll |
108 | AC_SUBST([WOE32DLL]) | 107 | AC_SUBST([WOE32DLL]) |
109 | 108 | ||
109 | dnl On mingw and Cygwin, we can activate special Makefile rules which add | ||
110 | dnl version information to the shared libraries and executables. | ||
111 | case "$host_os" in | ||
112 | mingw* | cygwin*) is_woe32=yes ;; | ||
113 | *) is_woe32=no ;; | ||
114 | esac | ||
115 | WOE32=$is_woe32 | ||
116 | AC_SUBST([WOE32]) | ||
117 | if test $WOE32 = yes; then | ||
118 | dnl Check for a program that compiles Windows resource files. | ||
119 | AC_CHECK_TOOL([WINDRES], [windres]) | ||
120 | fi | ||
121 | |||
122 | dnl Determine whether when creating a library, "-lc" should be passed to | ||
123 | dnl libtool or not. On many platforms, it is required for the libtool option | ||
124 | dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool | ||
125 | dnl in the *.la files - makes it impossible to create multithreaded programs, | ||
126 | dnl because libtool also reorders the -lc to come before the -pthread, and | ||
127 | dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>. | ||
128 | case "$host_os" in | ||
129 | hpux*) LTLIBC="" ;; | ||
130 | *) LTLIBC="-lc" ;; | ||
131 | esac | ||
132 | AC_SUBST([LTLIBC]) | ||
133 | |||
110 | dnl Rename some macros and functions used for locking. | 134 | dnl Rename some macros and functions used for locking. |
111 | AH_BOTTOM([ | 135 | AH_BOTTOM([ |
112 | #define __libc_lock_t gl_lock_t | 136 | #define __libc_lock_t gl_lock_t |
@@ -197,7 +221,9 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE], | |||
197 | AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, | 221 | AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, |
198 | [AC_TRY_LINK([#include <langinfo.h> | 222 | [AC_TRY_LINK([#include <langinfo.h> |
199 | #include <locale.h>], | 223 | #include <locale.h>], |
200 | [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], | 224 | [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); |
225 | return !cs; | ||
226 | ], | ||
201 | gt_cv_nl_locale_name=yes, | 227 | gt_cv_nl_locale_name=yes, |
202 | gt_cv_nl_locale_name=no) | 228 | gt_cv_nl_locale_name=no) |
203 | ]) | 229 | ]) |