Changeset 126306281bcb5dbf58fc5c6c6e28d0caf08e6a50
- Timestamp:
- 23/03/08 17:08:13 (8 months ago)
- git-parent:
- Files:
-
- configure.ac (modified) (1 diff)
- m4/gettext.m4 (modified) (2 diffs)
- m4/iconv.m4 (modified) (4 diffs)
- m4/intdiv0.m4 (modified) (3 diffs)
- m4/intl.m4 (modified) (5 diffs)
- m4/lib-link.m4 (modified) (24 diffs)
- m4/lock.m4 (modified) (2 diffs)
- m4/longlong.m4 (modified) (4 diffs)
- m4/po.m4 (modified) (4 diffs)
- m4/printf-posix.m4 (modified) (2 diffs)
- m4/size_max.m4 (modified) (3 diffs)
- m4/uintmax_t.m4 (modified) (2 diffs)
- m4/wint_t.m4 (modified) (2 diffs)
- po/Makefile.in.in (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
configure.ac
r974a399 r1263062 394 394 dnl Gettext stuff 395 395 dnl 396 AM_GNU_GETTEXT_VERSION(0.1 7)396 AM_GNU_GETTEXT_VERSION(0.16.1) 397 397 AM_GNU_GETTEXT([external]) 398 398 VLC_ADD_LIBS([libvlc vlc], [${LTLIBINTL}]) m4/gettext.m4
r974a399 r1263062 1 # gettext.m4 serial 60 (gettext-0.17)2 dnl Copyright (C) 1995-200 7Free Software Foundation, Inc.1 # gettext.m4 serial 59 (gettext-0.16.1) 2 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 363 363 364 364 365 dnl Checks for special options needed on MacOS X. 366 dnl Defines INTL_MACOSX_LIBS. 367 AC_DEFUN([gt_INTL_MACOSX], 368 [ 369 dnl Check for API introduced in MacOS X 10.2. 370 AC_CACHE_CHECK([for CFPreferencesCopyAppValue], 371 gt_cv_func_CFPreferencesCopyAppValue, 372 [gt_save_LIBS="$LIBS" 373 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 374 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], 375 [CFPreferencesCopyAppValue(NULL, NULL)], 376 [gt_cv_func_CFPreferencesCopyAppValue=yes], 377 [gt_cv_func_CFPreferencesCopyAppValue=no]) 378 LIBS="$gt_save_LIBS"]) 379 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then 380 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, 381 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) 382 fi 383 dnl Check for API introduced in MacOS X 10.3. 384 AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, 385 [gt_save_LIBS="$LIBS" 386 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 387 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], 388 [gt_cv_func_CFLocaleCopyCurrent=yes], 389 [gt_cv_func_CFLocaleCopyCurrent=no]) 390 LIBS="$gt_save_LIBS"]) 391 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then 392 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, 393 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) 394 fi 395 INTL_MACOSX_LIBS= 396 if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then 397 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" 398 fi 399 AC_SUBST([INTL_MACOSX_LIBS]) 400 ]) 401 402 365 403 dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. 366 404 m4_define([gt_NEEDS_INIT], m4/iconv.m4
r974a399 r1263062 1 # iconv.m4 serial AM 6 (gettext-0.17)2 dnl Copyright (C) 2000-2002 , 2007Free Software Foundation, Inc.1 # iconv.m4 serial AM4 (gettext-0.11.3) 2 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 22 22 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and 23 23 dnl those with the standalone portable GNU libiconv installed). 24 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles25 24 26 25 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV … … 35 34 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) 36 35 37 AC_CACHE_CHECK( [for iconv], am_cv_func_iconv, [36 AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ 38 37 am_cv_func_iconv="no, consider installing GNU libiconv" 39 38 am_cv_lib_iconv=no … … 58 57 ]) 59 58 if test "$am_cv_func_iconv" = yes; then 60 AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ 61 dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. 62 am_save_LIBS="$LIBS" 63 if test $am_cv_lib_iconv = yes; then 64 LIBS="$LIBS $LIBICONV" 65 fi 66 AC_TRY_RUN([ 67 #include <iconv.h> 68 #include <string.h> 69 int main () 70 { 71 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful 72 returns. */ 73 { 74 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); 75 if (cd_utf8_to_88591 != (iconv_t)(-1)) 76 { 77 static const char input[] = "\342\202\254"; /* EURO SIGN */ 78 char buf[10]; 79 const char *inptr = input; 80 size_t inbytesleft = strlen (input); 81 char *outptr = buf; 82 size_t outbytesleft = sizeof (buf); 83 size_t res = iconv (cd_utf8_to_88591, 84 (char **) &inptr, &inbytesleft, 85 &outptr, &outbytesleft); 86 if (res == 0) 87 return 1; 88 } 89 } 90 #if 0 /* This bug could be worked around by the caller. */ 91 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ 92 { 93 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); 94 if (cd_88591_to_utf8 != (iconv_t)(-1)) 95 { 96 static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; 97 char buf[50]; 98 const char *inptr = input; 99 size_t inbytesleft = strlen (input); 100 char *outptr = buf; 101 size_t outbytesleft = sizeof (buf); 102 size_t res = iconv (cd_88591_to_utf8, 103 (char **) &inptr, &inbytesleft, 104 &outptr, &outbytesleft); 105 if ((int)res > 0) 106 return 1; 107 } 108 } 109 #endif 110 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is 111 provided. */ 112 if (/* Try standardized names. */ 113 iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) 114 /* Try IRIX, OSF/1 names. */ 115 && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) 116 /* Try AIX names. */ 117 && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) 118 /* Try HP-UX names. */ 119 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) 120 return 1; 121 return 0; 122 }], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], 123 [case "$host_os" in 124 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; 125 *) am_cv_func_iconv_works="guessing yes" ;; 126 esac]) 127 LIBS="$am_save_LIBS" 128 ]) 129 case "$am_cv_func_iconv_works" in 130 *no) am_func_iconv=no am_cv_lib_iconv=no ;; 131 *) am_func_iconv=yes ;; 132 esac 133 else 134 am_func_iconv=no am_cv_lib_iconv=no 135 fi 136 if test "$am_func_iconv" = yes; then 137 AC_DEFINE(HAVE_ICONV, 1, 138 [Define if you have the iconv() function and it works.]) 59 AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) 139 60 fi 140 61 if test "$am_cv_lib_iconv" = yes; then m4/intdiv0.m4
r974a399 r1263062 1 # intdiv0.m4 serial 2 (gettext-0.17)2 dnl Copyright (C) 2002 , 2007Free Software Foundation, Inc.1 # intdiv0.m4 serial 1 (gettext-0.11.3) 2 dnl Copyright (C) 2002 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 15 15 gt_cv_int_divbyzero_sigfpe, 16 16 [ 17 gt_cv_int_divbyzero_sigfpe= 18 changequote(,)dnl 19 case "$host_os" in 20 macos* | darwin[6-9]* | darwin[1-9][0-9]*) 21 # On MacOS X 10.2 or newer, just assume the same as when cross- 22 # compiling. If we were to perform the real test, 1 Crash Report 23 # dialog window would pop up. 24 case "$host_cpu" in 25 i[34567]86 | x86_64) 26 gt_cv_int_divbyzero_sigfpe="guessing yes" ;; 27 esac 28 ;; 29 esac 30 changequote([,])dnl 31 if test -z "$gt_cv_int_divbyzero_sigfpe"; then 32 AC_TRY_RUN([ 17 AC_TRY_RUN([ 33 18 #include <stdlib.h> 34 19 #include <signal.h> 35 20 36 21 static void 22 #ifdef __cplusplus 37 23 sigfpe_handler (int sig) 24 #else 25 sigfpe_handler (sig) int sig; 26 #endif 38 27 { 39 28 /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ … … 63 52 } 64 53 ], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, 65 [ 66 # Guess based on the CPU. 67 changequote(,)dnl 68 case "$host_cpu" in 69 alpha* | i[34567]86 | x86_64 | m68k | s390*) 70 gt_cv_int_divbyzero_sigfpe="guessing yes";; 71 *) 72 gt_cv_int_divbyzero_sigfpe="guessing no";; 73 esac 74 changequote([,])dnl 75 ]) 76 fi 54 [ 55 # Guess based on the CPU. 56 case "$host_cpu" in 57 alpha* | i[34567]86 | m68k | s390*) 58 gt_cv_int_divbyzero_sigfpe="guessing yes";; 59 *) 60 gt_cv_int_divbyzero_sigfpe="guessing no";; 61 esac 62 ]) 77 63 ]) 78 64 case "$gt_cv_int_divbyzero_sigfpe" in m4/intl.m4
r974a399 r1263062 1 # intl.m4 serial 8 (gettext-0.17)2 dnl Copyright (C) 1995-200 7Free Software Foundation, Inc.1 # intl.m4 serial 3 (gettext-0.16) 2 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 34 34 AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl 35 35 AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl 36 AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl 36 37 AC_REQUIRE([gt_TYPE_WCHAR_T])dnl 37 38 AC_REQUIRE([gt_TYPE_WINT_T])dnl … … 98 99 if test "$enable_shared" = yes; then 99 100 case "$host_os" in 100 mingw* |cygwin*) is_woe32dll=yes ;;101 cygwin*) is_woe32dll=yes ;; 101 102 *) is_woe32dll=no ;; 102 103 esac … … 106 107 WOE32DLL=$is_woe32dll 107 108 AC_SUBST([WOE32DLL]) 108 109 dnl On mingw and Cygwin, we can activate special Makefile rules which add110 dnl version information to the shared libraries and executables.111 case "$host_os" in112 mingw* | cygwin*) is_woe32=yes ;;113 *) is_woe32=no ;;114 esac115 WOE32=$is_woe32116 AC_SUBST([WOE32])117 if test $WOE32 = yes; then118 dnl Check for a program that compiles Windows resource files.119 AC_CHECK_TOOL([WINDRES], [windres])120 fi121 122 dnl Determine whether when creating a library, "-lc" should be passed to123 dnl libtool or not. On many platforms, it is required for the libtool option124 dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool125 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, and127 dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.128 case "$host_os" in129 hpux*) LTLIBC="" ;;130 *) LTLIBC="-lc" ;;131 esac132 AC_SUBST([LTLIBC])133 109 134 110 dnl Rename some macros and functions used for locking. … … 222 198 [AC_TRY_LINK([#include <langinfo.h> 223 199 #include <locale.h>], 224 [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES)); 225 return !cs; 226 ], 200 [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], 227 201 gt_cv_nl_locale_name=yes, 228 202 gt_cv_nl_locale_name=no) m4/lib-link.m4
r974a399 r1263062 1 # lib-link.m4 serial 13 (gettext-0.17)2 dnl Copyright (C) 2001-200 7Free Software Foundation, Inc.1 # lib-link.m4 serial 9 (gettext-0.16) 2 dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 7 7 dnl From Bruno Haible. 8 8 9 AC_PREREQ(2.5 4)9 AC_PREREQ(2.50) 10 10 11 11 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and … … 13 13 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and 14 14 dnl augments the CPPFLAGS variable. 15 dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname16 dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.17 15 AC_DEFUN([AC_LIB_LINKFLAGS], 18 16 [ … … 27 25 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" 28 26 ac_cv_lib[]Name[]_cppflags="$INC[]NAME" 29 ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"30 27 ]) 31 28 LIB[]NAME="$ac_cv_lib[]Name[]_libs" 32 29 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" 33 30 INC[]NAME="$ac_cv_lib[]Name[]_cppflags" 34 LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"35 31 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) 36 32 AC_SUBST([LIB]NAME) 37 33 AC_SUBST([LTLIB]NAME) 38 AC_SUBST([LIB]NAME[_PREFIX])39 34 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the 40 35 dnl results of this search when this library appears as a dependency. … … 52 47 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs 53 48 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. 54 dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname55 dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.56 49 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], 57 50 [ … … 90 83 LIB[]NAME= 91 84 LTLIB[]NAME= 92 LIB[]NAME[]_PREFIX=93 85 fi 94 86 AC_SUBST([HAVE_LIB]NAME) 95 87 AC_SUBST([LIB]NAME) 96 88 AC_SUBST([LTLIB]NAME) 97 AC_SUBST([LIB]NAME[_PREFIX])98 89 undefine([Name]) 99 90 undefine([NAME]) … … 101 92 102 93 dnl Determine the platform dependent parameters needed to use rpath: 103 dnl acl_libext, 104 dnl acl_shlibext, 105 dnl acl_hardcode_libdir_flag_spec, 106 dnl acl_hardcode_libdir_separator, 107 dnl acl_hardcode_direct, 108 dnl acl_hardcode_minus_L. 94 dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, 95 dnl hardcode_direct, hardcode_minus_L. 109 96 AC_DEFUN([AC_LIB_RPATH], 110 97 [ … … 123 110 ]) 124 111 wl="$acl_cv_wl" 125 acl_libext="$acl_cv_libext" 126 acl_shlibext="$acl_cv_shlibext" 127 acl_libname_spec="$acl_cv_libname_spec" 128 acl_library_names_spec="$acl_cv_library_names_spec" 129 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" 130 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" 131 acl_hardcode_direct="$acl_cv_hardcode_direct" 132 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" 112 libext="$acl_cv_libext" 113 shlibext="$acl_cv_shlibext" 114 hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" 115 hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" 116 hardcode_direct="$acl_cv_hardcode_direct" 117 hardcode_minus_L="$acl_cv_hardcode_minus_L" 133 118 dnl Determine whether the user wants rpath handling at all. 134 119 AC_ARG_ENABLE(rpath, … … 140 125 dnl the libraries corresponding to explicit and implicit dependencies. 141 126 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. 142 dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found143 dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.144 127 AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 145 128 [ … … 147 130 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 148 131 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 149 dnl Autoconf >= 2.61 supports dots in --with options.150 define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])151 132 dnl By default, look in $includedir and $libdir. 152 133 use_additional=yes … … 155 136 eval additional_libdir=\"$libdir\" 156 137 ]) 157 AC_LIB_ARG_WITH([lib ]N_A_M_E[-prefix],158 [ --with-lib ]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib159 --without-lib ]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],138 AC_LIB_ARG_WITH([lib$1-prefix], 139 [ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib 140 --without-lib$1-prefix don't search for lib$1 in includedir and libdir], 160 141 [ 161 142 if test "X$withval" = "Xno"; then … … 178 159 LTLIB[]NAME= 179 160 INC[]NAME= 180 LIB[]NAME[]_PREFIX=181 161 rpathdirs= 182 162 ltrpathdirs= … … 218 198 found_so= 219 199 found_a= 220 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name221 if test -n "$acl_shlibext"; then222 shrext=".$acl_shlibext" # typically: shrext=.so223 else224 shrext=225 fi226 200 if test $use_additional = yes; then 227 dir="$additional_libdir"228 dnl The same code as in the loop below:229 dnl First look for a shared library.230 if test -n "$acl_shlibext"; then231 if test -f "$dir/$libname$shrext"; then232 found_dir="$dir"233 found_so="$ dir/$libname$shrext"201 if test -n "$shlibext" \ 202 && { test -f "$additional_libdir/lib$name.$shlibext" \ 203 || { test "$shlibext" = dll \ 204 && test -f "$additional_libdir/lib$name.dll.a"; }; }; then 205 found_dir="$additional_libdir" 206 if test -f "$additional_libdir/lib$name.$shlibext"; then 207 found_so="$additional_libdir/lib$name.$shlibext" 234 208 else 235 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then 236 ver=`(cd "$dir" && \ 237 for f in "$libname$shrext".*; do echo "$f"; done \ 238 | sed -e "s,^$libname$shrext\\\\.,," \ 239 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ 240 | sed 1q ) 2>/dev/null` 241 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then 242 found_dir="$dir" 243 found_so="$dir/$libname$shrext.$ver" 244 fi 245 else 246 eval library_names=\"$acl_library_names_spec\" 247 for f in $library_names; do 248 if test -f "$dir/$f"; then 249 found_dir="$dir" 250 found_so="$dir/$f" 251 break 252 fi 253 done 209 found_so="$additional_libdir/lib$name.dll.a" 210 fi 211 if test -f "$additional_libdir/lib$name.la"; then 212 found_la="$additional_libdir/lib$name.la" 213 fi 214 else 215 if test -f "$additional_libdir/lib$name.$libext"; then 216 found_dir="$additional_libdir" 217 found_a="$additional_libdir/lib$name.$libext" 218 if test -f "$additional_libdir/lib$name.la"; then 219 found_la="$additional_libdir/lib$name.la" 254 220 fi 255 fi256 fi257 dnl Then look for a static library.258 if test "X$found_dir" = "X"; then259 if test -f "$dir/$libname.$acl_libext"; then260 found_dir="$dir"261 found_a="$dir/$libname.$acl_libext"262 fi263 fi264 if test "X$found_dir" != "X"; then265 if test -f "$dir/$libname.la"; then266 found_la="$dir/$libname.la"267 221 fi 268 222 fi … … 274 228 -L*) 275 229 dir=`echo "X$x" | sed -e 's/^X-L//'` 276 dnl First look for a shared library. 277 if test -n "$acl_shlibext"; then 278 if test -f "$dir/$libname$shrext"; then 230 if test -n "$shlibext" \ 231 && { test -f "$dir/lib$name.$shlibext" \ 232 || { test "$shlibext" = dll \ 233 && test -f "$dir/lib$name.dll.a"; }; }; then 234 found_dir="$dir" 235 if test -f "$dir/lib$name.$shlibext"; then 236 found_so="$dir/lib$name.$shlibext" 237 else 238 found_so="$dir/lib$name.dll.a" 239 fi 240 if test -f "$dir/lib$name.la"; then 241 found_la="$dir/lib$name.la" 242 fi 243 else 244 if test -f "$dir/lib$name.$libext"; then 279 245 found_dir="$dir" 280 found_so="$dir/$libname$shrext" 281 else 282 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then 283 ver=`(cd "$dir" && \ 284 for f in "$libname$shrext".*; do echo "$f"; done \ 285 | sed -e "s,^$libname$shrext\\\\.,," \ 286 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ 287 | sed 1q ) 2>/dev/null` 288 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then 289 found_dir="$dir" 290 found_so="$dir/$libname$shrext.$ver" 291 fi 292 else 293 eval library_names=\"$acl_library_names_spec\" 294 for f in $library_names; do 295 if test -f "$dir/$f"; then 296 found_dir="$dir" 297 found_so="$dir/$f" 298 break 299 fi 300 done 246 found_a="$dir/lib$name.$libext" 247 if test -f "$dir/lib$name.la"; then 248 found_la="$dir/lib$name.la" 301 249 fi 302 fi303 fi304 dnl Then look for a static library.305 if test "X$found_dir" = "X"; then306 if test -f "$dir/$libname.$acl_libext"; then307 found_dir="$dir"308 found_a="$dir/$libname.$acl_libext"309 fi310 fi311 if test "X$found_dir" != "X"; then312 if test -f "$dir/$libname.la"; then313 found_la="$dir/$libname.la"314 250 fi 315 251 fi … … 347 283 fi 348 284 dnl The hardcoding into $LIBNAME is system dependent. 349 if test "$ acl_hardcode_direct" = yes; then285 if test "$hardcode_direct" = yes; then 350 286 dnl Using DIR/libNAME.so during linking hardcodes DIR into the 351 287 dnl resulting binary. 352 288 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 353 289 else 354 if test -n "$ acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then290 if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then 355 291 dnl Use an explicit option to hardcode DIR into the resulting 356 292 dnl binary. … … 383 319 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" 384 320 fi 385 if test "$ acl_hardcode_minus_L" != no; then321 if test "$hardcode_minus_L" != no; then 386 322 dnl FIXME: Not sure whether we should use 387 323 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" … … 389 325 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 390 326 else 391 dnl We cannot use $ acl_hardcode_runpath_var and LD_RUN_PATH327 dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH 392 328 dnl here, because this doesn't fit in flags passed to the 393 329 dnl compiler. So give up. No hardcoding. This affects only … … 416 352 */$acl_libdirstem | */$acl_libdirstem/) 417 353 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` 418 LIB[]NAME[]_PREFIX="$basedir"419 354 additional_includedir="$basedir/include" 420 355 ;; … … 578 513 done 579 514 if test "X$rpathdirs" != "X"; then 580 if test -n "$ acl_hardcode_libdir_separator"; then515 if test -n "$hardcode_libdir_separator"; then 581 516 dnl Weird platform: only the last -rpath option counts, the user must 582 517 dnl pass all path elements in one option. We can arrange that for a … … 584 519 alldirs= 585 520 for found_dir in $rpathdirs; do 586 alldirs="${alldirs}${alldirs:+$ acl_hardcode_libdir_separator}$found_dir"521 alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" 587 522 done 588 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.523 dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. 589 524 acl_save_libdir="$libdir" 590 525 libdir="$alldirs" 591 eval flag=\"$ acl_hardcode_libdir_flag_spec\"526 eval flag=\"$hardcode_libdir_flag_spec\" 592 527 libdir="$acl_save_libdir" 593 528 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" … … 597 532 acl_save_libdir="$libdir" 598 533 libdir="$found_dir" 599 eval flag=\"$ acl_hardcode_libdir_flag_spec\"534 eval flag=\"$hardcode_libdir_flag_spec\" 600 535 libdir="$acl_save_libdir" 601 536 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" … … 646 581 $1= 647 582 if test "$enable_rpath" != no; then 648 if test -n "$ acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then583 if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then 649 584 dnl Use an explicit option to hardcode directories into the resulting 650 585 dnl binary. … … 680 615 else 681 616 dnl The linker is used for linking directly. 682 if test -n "$ acl_hardcode_libdir_separator"; then617 if test -n "$hardcode_libdir_separator"; then 683 618 dnl Weird platform: only the last -rpath option counts, the user 684 619 dnl must pass all path elements in one option. 685 620 alldirs= 686 621 for dir in $rpathdirs; do 687 alldirs="${alldirs}${alldirs:+$ acl_hardcode_libdir_separator}$dir"622 alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" 688 623 done 689 624 acl_save_libdir="$libdir" 690 625 libdir="$alldirs" 691 eval flag=\"$ acl_hardcode_libdir_flag_spec\"626 eval flag=\"$hardcode_libdir_flag_spec\" 692 627 libdir="$acl_save_libdir" 693 628 $1="$flag" … … 697 632 acl_save_libdir="$libdir" 698 633 libdir="$dir" 699 eval flag=\"$ acl_hardcode_libdir_flag_spec\"634 eval flag=\"$hardcode_libdir_flag_spec\" 700 635 libdir="$acl_save_libdir" 701 636 $1="${$1}${$1:+ }$flag" m4/lock.m4
r974a399 r1263062 1 # lock.m4 serial 7 (gettext-0.17)2 dnl Copyright (C) 2005-200 7Free Software Foundation, Inc.1 # lock.m4 serial 6 (gettext-0.16) 2 dnl Copyright (C) 2005-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 36 36 37 37 AC_REQUIRE([AC_CANONICAL_HOST]) 38 dnl _GNU_SOURCE is needed for pthread_rwlock_t on glibc systems. 39 dnl AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60 and obsoletes 40 dnl AC_GNU_SOURCE. 41 m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], 42 [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])], 43 [AC_REQUIRE([AC_GNU_SOURCE])]) 38 AC_REQUIRE([AC_GNU_SOURCE]) dnl needed for pthread_rwlock_t on glibc systems 44 39 dnl Check for multithreading. 45 40 AC_ARG_ENABLE(threads, m4/longlong.m4
r974a399 r1263062 1 # longlong.m4 serial 132 dnl Copyright (C) 1999-200 7Free Software Foundation, Inc.1 # longlong.m4 serial 8 2 dnl Copyright (C) 1999-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 8 8 9 9 # Define HAVE_LONG_LONG_INT if 'long long int' works. 10 # This fixes a bug in Autoconf 2.6 1, but can be removed once we11 # assume 2.6 2everywhere.10 # This fixes a bug in Autoconf 2.60, but can be removed once we 11 # assume 2.61 everywhere. 12 12 13 13 # Note: If the type 'long long int' exists but is only 32 bits large 14 # (as on some very old compilers), HAVE_LONG_LONG_INT will not be14 # (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be 15 15 # defined. In this case you can treat 'long long int' like 'long int'. 16 16 … … 19 19 AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int], 20 20 [AC_LINK_IFELSE( 21 [_AC_TYPE_LONG_LONG_SNIPPET], 22 [dnl This catches a bug in Tandem NonStop Kernel (OSS) cc -O circa 2004. 23 dnl If cross compiling, assume the bug isn't important, since 24 dnl nobody cross compiles for this platform as far as we know. 25 AC_RUN_IFELSE( 26 [AC_LANG_PROGRAM( 27 [[@%:@include <limits.h> 28 @%:@ifndef LLONG_MAX 29 @%:@ define HALF \ 30 (1LL << (sizeof (long long int) * CHAR_BIT - 2)) 31 @%:@ define LLONG_MAX (HALF - 1 + HALF) 32 @%:@endif]], 33 [[long long int n = 1; 34 int i; 35 for (i = 0; ; i++) 36 { 37 long long int m = n << i; 38 if (m >> i != n) 39 return 1; 40 if (LLONG_MAX / 2 < m) 41 break; 42 } 43 return 0;]])], 44 [ac_cv_type_long_long_int=yes], 45 [ac_cv_type_long_long_int=no], 46 [ac_cv_type_long_long_int=yes])], 21 [AC_LANG_PROGRAM( 22 [[long long int ll = 9223372036854775807ll; 23 long long int nll = -9223372036854775807LL; 24 typedef int a[((-9223372036854775807LL < 0 25 && 0 < 9223372036854775807ll) 26 ? 1 : -1)]; 27 int i = 63;]], 28 [[long long int llmax = 9223372036854775807ll; 29 return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i) 30 | (llmax / ll) | (llmax % ll));]])], 31 [ac_cv_type_long_long_int=yes], 47 32 [ac_cv_type_long_long_int=no])]) 48 33 if test $ac_cv_type_long_long_int = yes; then … … 52 37 ]) 53 38 54 # Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works. 55 # This fixes a bug in Autoconf 2.61, but can be removed once we 56 # assume 2.62 everywhere. 57 58 # Note: If the type 'unsigned long long int' exists but is only 32 bits 59 # large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT 60 # will not be defined. In this case you can treat 'unsigned long long int' 61 # like 'unsigned long int'. 62 63 AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], 39 # This macro is obsolescent and should go away soon. 40 AC_DEFUN([gl_AC_TYPE_LONG_LONG], 64 41 [ 65 AC_CACHE_CHECK([for unsigned long long int], 66 [ac_cv_type_unsigned_long_long_int], 67 [AC_LINK_IFELSE( 68 [_AC_TYPE_LONG_LONG_SNIPPET], 69 [ac_cv_type_unsigned_long_long_int=yes], 70 [ac_cv_type_unsigned_long_long_int=no])]) 71 if test $ac_cv_type_unsigned_long_long_int = yes; then 72 AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, 73 [Define to 1 if the system has the type `unsigned long long int'.]) 42 AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) 43 ac_cv_type_long_long=$ac_cv_type_long_long_int 44 if test $ac_cv_type_long_long = yes; then 45 AC_DEFINE(HAVE_LONG_LONG, 1, 46 [Define if you have the 'long long' type.]) 74 47 fi 75 48 ]) 76 77 # Expands to a C program that can be used to test for simultaneous support78 # of 'long long' and 'unsigned long long'. We don't want to say that79 # 'long long' is available if 'unsigned long long' is not, or vice versa,80 # because too many programs rely on the symmetry between signed and unsigned81 # integer types (excluding 'bool').82 AC_DEFUN([_AC_TYPE_LONG_LONG_SNIPPET],83 [84 AC_LANG_PROGRAM(85 [[/* Test preprocessor. */86 #if ! (-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)87 error in preprocessor;88 #endif89 #if ! (18446744073709551615ULL <= -1ull)90 error in preprocessor;91 #endif92 /* Test literals. */93 long long int ll = 9223372036854775807ll;94 long long int nll = -9223372036854775807LL;95 unsigned long long int ull = 18446744073709551615ULL;96 /* Test constant expressions. */97 typedef int a[((-9223372036854775807LL < 0 && 0 < 9223372036854775807ll)98 ? 1 : -1)];99 typedef int b[(18446744073709551615ULL <= (unsigned long long int) -1100 ? 1 : -1)];101 int i = 63;]],102 [[/* Test availability of runtime routines for shift and division. */103 long long int llmax = 9223372036854775807ll;104 unsigned long long int ullmax = 18446744073709551615ull;105 return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)106 | (llmax / ll) | (llmax % ll)107 | (ull << 63) | (ull >> 63) | (ull << i) | (ull >> i)108 | (ullmax / ull) | (ullmax % ull));]])109 ])m4/po.m4
r974a399 r1263062 1 # po.m4 serial 1 5 (gettext-0.17)2 dnl Copyright (C) 1995-200 7Free Software Foundation, Inc.1 # po.m4 serial 13 (gettext-0.15) 2 dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 27 27 AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake 28 28 AC_REQUIRE([AM_NLS])dnl 29 30 dnl Release version of the gettext macros. This is used to ensure that31 dnl the gettext macros and po/Makefile.in.in are in sync.32 AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])33 29 34 30 dnl Perform the following tests also if --disable-nls has been given, … … 88 84 test -n "$localedir" || localedir='${datadir}/locale' 89 85 AC_SUBST([localedir]) 90 91 dnl Support for AM_XGETTEXT_OPTION.92 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=93 AC_SUBST([XGETTEXT_EXTRA_OPTIONS])94 86 95 87 AC_CONFIG_COMMANDS([po-directories], [[ … … 435 427 mv "$ac_file.tmp" "$ac_file" 436 428 ]) 437 438 dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.439 AC_DEFUN([AM_XGETTEXT_OPTION_INIT],440 [441 XGETTEXT_EXTRA_OPTIONS=442 ])443 444 dnl Registers an option to be passed to xgettext in the po subdirectory.445 AC_DEFUN([AM_XGETTEXT_OPTION],446 [447 AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])448 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"449 ])m4/printf-posix.m4
r974a399 r1263062 1 # printf-posix.m4 serial 3 (gettext-0.17)2 dnl Copyright (C) 2003 , 2007Free Software Foundation, Inc.1 # printf-posix.m4 serial 2 (gettext-0.13.1) 2 dnl Copyright (C) 2003 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation 4 4 dnl gives unlimited permission to copy and/or distribute it, … … 29 29 [ 30 30 AC_EGREP_CPP(notposix, [ 31 #if defined __NetBSD__ || defined _ _BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__31 #if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ 32 32 notposix 33 33 #endif m4/size_max.m4
r974a399 r1263062 1 # size_max.m4 serial 61 # size_max.m4 serial 5 2 2 dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc. 3 3 dnl This file is free software; the Free Software Foundation … … 27 27 dnl than the type 'unsigned long'. Try hard to find a definition that can 28 28 dnl be used in a preprocessor #if, i.e. doesn't contain a cast. 29 AC_COMPUTE_INT([size_t_bits_minus_1], [sizeof (size_t) * CHAR_BIT - 1],29 _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1, 30 30 [#include <stddef.h> 31 31 #include <limits.h>], size_t_bits_minus_1=) 32 &n
