Author: matthew Date: 2009-05-17 14:46:57 -0600 (Sun, 17 May 2009) New Revision: 2081
Removed: trunk/util-linux-ng/util-linux-ng-2.15-blkid_detection-1.patch trunk/util-linux-ng/util-linux-ng-2.15-compile_fix-1.patch Log: Remove unncessary Util-Linux-NG patches, util-linux-ng-2.15-fixes-1.patch is more comprehensive Deleted: trunk/util-linux-ng/util-linux-ng-2.15-blkid_detection-1.patch =================================================================== --- trunk/util-linux-ng/util-linux-ng-2.15-blkid_detection-1.patch 2009-05-17 20:45:43 UTC (rev 2080) +++ trunk/util-linux-ng/util-linux-ng-2.15-blkid_detection-1.patch 2009-05-17 20:46:57 UTC (rev 2081) @@ -1,1070 +0,0 @@ -Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> -Date: 2009-05-11 -Initial Package Version: 2.15 -Upstream Status: From upstream -Origin: http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=commitdiff;h=7c950efa3438b02097d915497d67248dde709e72 -Description: The blkid.pc from e2fsprogs >= 1.41.2 uses - -I${includedir}/blkid, but Util-Linux-NG only checks - for blkid.h in ${includedir}/ - -diff -Naur util-linux-ng-2.15.orig/config.h.in util-linux-ng-2.15/config.h.in ---- util-linux-ng-2.15.orig/config.h.in 2009-05-05 21:26:40.000000000 +0000 -+++ util-linux-ng-2.15/config.h.in 2009-05-11 21:27:14.000000000 +0000 -@@ -7,9 +7,15 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to 1 if you have the <blkid/blkid.h> header file. */ -+#undef HAVE_BLKID_BLKID_H -+ - /* Define to 1 if you have the blkid_evaluate_tag(). */ - #undef HAVE_BLKID_EVALUATE_TAG - -+/* Define to 1 if you have the <blkid.h> header file. */ -+#undef HAVE_BLKID_H -+ - /* Define if the GNU dcgettext() function is already present or preinstalled. - */ - #undef HAVE_DCGETTEXT -diff -Naur util-linux-ng-2.15.orig/configure util-linux-ng-2.15/configure ---- util-linux-ng-2.15.orig/configure 2009-05-05 21:21:32.000000000 +0000 -+++ util-linux-ng-2.15/configure 2009-05-11 21:38:10.000000000 +0000 -@@ -14090,19 +14090,192 @@ - $as_echo "yes" >&6; } - have_blkid=yes - fi -- { $as_echo "$as_me:$LINENO: checking for blkid_evaluate_tag in -lblkid" >&5 --$as_echo_n "checking for blkid_evaluate_tag in -lblkid... " >&6; } --if test "${ac_cv_lib_blkid_blkid_evaluate_tag+set}" = set; then -+ if test "x$have_blkid" = xyes; then -+ old_CFLAGS="$CFLAGS" -+ old_CPPFLAGS="$CPPFLAGS" -+ old_LDFLAGS="$LDFLAGS" -+ CFLAGS="$CFLAGS $BLKID_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $BLKID_CFLAGS" -+ LDFLAGS="$LDFLAGS $BLKID_LIBS" -+ -+ -+for ac_header in blkid.h blkid/blkid.h -+do -+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lblkid $LIBS" -+ # Is the header compilable? -+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+$as_echo_n "checking $ac_header usability... " >&6; } - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_compile") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then -+ ac_header_compiler=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_compiler=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } -+ -+# Is the header present? -+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+$as_echo_n "checking $ac_header presence... " >&6; } -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -+$as_echo "$ac_try_echo") >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then -+ ac_header_preproc=yes -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+ -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( cat <<\_ASBOX -+## ------------------------------ ## -+## Report this to [email protected] ## -+## ------------------------------ ## -+_ASBOX -+ ) | sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -+$as_echo_n "checking for $ac_header... " >&6; } -+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+ac_res=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ -+fi -+as_val=`eval 'as_val=${'$as_ac_Header'} -+ $as_echo "$as_val"'` -+ if test "x$as_val" = x""yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ break -+fi -+ -+done -+ -+ { $as_echo "$as_me:$LINENO: checking for blkid_evaluate_tag" >&5 -+$as_echo_n "checking for blkid_evaluate_tag... " >&6; } -+if test "${ac_cv_func_blkid_evaluate_tag+set}" = set; then -+ $as_echo_n "(cached) " >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define blkid_evaluate_tag to an innocuous variant, in case <limits.h> declares blkid_evaluate_tag. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define blkid_evaluate_tag innocuous_blkid_evaluate_tag -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char blkid_evaluate_tag (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef blkid_evaluate_tag - - /* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -@@ -14111,6 +14284,13 @@ - extern "C" - #endif - char blkid_evaluate_tag (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_blkid_evaluate_tag || defined __stub___blkid_evaluate_tag -+choke me -+#endif -+ - int - main () - { -@@ -14140,25 +14320,28 @@ - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_blkid_blkid_evaluate_tag=yes -+ ac_cv_func_blkid_evaluate_tag=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_blkid_blkid_evaluate_tag=no -+ ac_cv_func_blkid_evaluate_tag=no - fi - - rm -rf conftest.dSYM - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_blkid_blkid_evaluate_tag" >&5 --$as_echo "$ac_cv_lib_blkid_blkid_evaluate_tag" >&6; } --if test "x$ac_cv_lib_blkid_blkid_evaluate_tag" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_blkid_evaluate_tag" >&5 -+$as_echo "$ac_cv_func_blkid_evaluate_tag" >&6; } -+if test "x$ac_cv_func_blkid_evaluate_tag" = x""yes; then - have_blkid_evaluate=yes - fi - -+ CFLAGS="$old_CFLAGS" -+ CPPFLAGS="$old_CPPFLAGS" -+ LDFLAGS="$old_LDFLAGS" -+ fi - elif test "x$with_fsprobe" = xvolume_id; then - - pkg_failed=no -diff -Naur util-linux-ng-2.15.orig/configure.ac util-linux-ng-2.15/configure.ac ---- util-linux-ng-2.15.orig/configure.ac 2009-05-05 20:20:44.000000000 +0000 -+++ util-linux-ng-2.15/configure.ac 2009-05-11 21:19:16.000000000 +0000 -@@ -180,7 +180,19 @@ - - if test "x$with_fsprobe" = xblkid; then - PKG_CHECK_MODULES(BLKID, blkid, [have_blkid=yes], []) -- AC_CHECK_LIB(blkid, blkid_evaluate_tag, [have_blkid_evaluate=yes], []) -+ if test "x$have_blkid" = xyes; then -+ old_CFLAGS="$CFLAGS" -+ old_CPPFLAGS="$CPPFLAGS" -+ old_LDFLAGS="$LDFLAGS" -+ CFLAGS="$CFLAGS $BLKID_CFLAGS" -+ CPPFLAGS="$CPPFLAGS $BLKID_CFLAGS" -+ LDFLAGS="$LDFLAGS $BLKID_LIBS" -+ AC_CHECK_HEADERS([blkid.h blkid/blkid.h], [break], []) -+ AC_CHECK_FUNC(blkid_evaluate_tag, [have_blkid_evaluate=yes], []) -+ CFLAGS="$old_CFLAGS" -+ CPPFLAGS="$old_CPPFLAGS" -+ LDFLAGS="$old_LDFLAGS" -+ fi - elif test "x$with_fsprobe" = xvolume_id; then - PKG_CHECK_MODULES(VOLUME_ID, volume_id, [have_volume_id=yes], []) - elif test "x$with_fsprobe" = xbuiltin; then -diff -Naur util-linux-ng-2.15.orig/lib/fsprobe.c util-linux-ng-2.15/lib/fsprobe.c ---- util-linux-ng-2.15.orig/lib/fsprobe.c 2009-05-05 19:16:46.000000000 +0000 -+++ util-linux-ng-2.15/lib/fsprobe.c 2009-05-11 21:20:06.000000000 +0000 -@@ -7,7 +7,11 @@ - #include <sys/types.h> - #include <stdlib.h> - -+#ifdef HAVE_BLKID_BLKID_H -+#include <blkid/blkid.h> -+#else - #include <blkid.h> -+#endif - - #include "blkdev.h" - #include "canonicalize.h" -diff -Naur util-linux-ng-2.15.orig/m4/codeset.m4 util-linux-ng-2.15/m4/codeset.m4 ---- util-linux-ng-2.15.orig/m4/codeset.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/codeset.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,23 @@ -+# codeset.m4 serial AM1 (gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([AM_LANGINFO_CODESET], -+[ -+ AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, -+ [AC_TRY_LINK([#include <langinfo.h>], -+ [char* cs = nl_langinfo(CODESET);], -+ am_cv_langinfo_codeset=yes, -+ am_cv_langinfo_codeset=no) -+ ]) -+ if test $am_cv_langinfo_codeset = yes; then -+ AC_DEFINE(HAVE_LANGINFO_CODESET, 1, -+ [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/glibc21.m4 util-linux-ng-2.15/m4/glibc21.m4 ---- util-linux-ng-2.15.orig/m4/glibc21.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/glibc21.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,32 @@ -+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# Test for the GNU C Library, version 2.1 or newer. -+# From Bruno Haible. -+ -+AC_DEFUN([jm_GLIBC21], -+ [ -+ AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, -+ ac_cv_gnu_library_2_1, -+ [AC_EGREP_CPP([Lucky GNU user], -+ [ -+#include <features.h> -+#ifdef __GNU_LIBRARY__ -+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) -+ Lucky GNU user -+ #endif -+#endif -+ ], -+ ac_cv_gnu_library_2_1=yes, -+ ac_cv_gnu_library_2_1=no) -+ ] -+ ) -+ AC_SUBST(GLIBC21) -+ GLIBC21="$ac_cv_gnu_library_2_1" -+ ] -+) -diff -Naur util-linux-ng-2.15.orig/m4/intdiv0.m4 util-linux-ng-2.15/m4/intdiv0.m4 ---- util-linux-ng-2.15.orig/m4/intdiv0.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/intdiv0.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,72 @@ -+# intdiv0.m4 serial 1 (gettext-0.11.3) -+dnl Copyright (C) 2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gt_INTDIV0], -+[ -+ AC_REQUIRE([AC_PROG_CC])dnl -+ AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+ AC_CACHE_CHECK([whether integer division by zero raises SIGFPE], -+ gt_cv_int_divbyzero_sigfpe, -+ [ -+ AC_TRY_RUN([ -+#include <stdlib.h> -+#include <signal.h> -+ -+static void -+#ifdef __cplusplus -+sigfpe_handler (int sig) -+#else -+sigfpe_handler (sig) int sig; -+#endif -+{ -+ /* Exit with code 0 if SIGFPE, with code 1 if any other signal. */ -+ exit (sig != SIGFPE); -+} -+ -+int x = 1; -+int y = 0; -+int z; -+int nan; -+ -+int main () -+{ -+ signal (SIGFPE, sigfpe_handler); -+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP. */ -+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP) -+ signal (SIGTRAP, sigfpe_handler); -+#endif -+/* Linux/SPARC yields signal SIGILL. */ -+#if defined (__sparc__) && defined (__linux__) -+ signal (SIGILL, sigfpe_handler); -+#endif -+ -+ z = x / y; -+ nan = y / y; -+ exit (1); -+} -+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no, -+ [ -+ # Guess based on the CPU. -+ case "$host_cpu" in -+ alpha* | i[34567]86 | m68k | s390*) -+ gt_cv_int_divbyzero_sigfpe="guessing yes";; -+ *) -+ gt_cv_int_divbyzero_sigfpe="guessing no";; -+ esac -+ ]) -+ ]) -+ case "$gt_cv_int_divbyzero_sigfpe" in -+ *yes) value=1;; -+ *) value=0;; -+ esac -+ AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value, -+ [Define if integer division by zero raises signal SIGFPE.]) -+]) -diff -Naur util-linux-ng-2.15.orig/m4/intmax.m4 util-linux-ng-2.15/m4/intmax.m4 ---- util-linux-ng-2.15.orig/m4/intmax.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/intmax.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,32 @@ -+# intmax.m4 serial 1 (gettext-0.12) -+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+dnl Test whether the system has the 'intmax_t' type, but don't attempt to -+dnl find a replacement if it is lacking. -+ -+AC_DEFUN([gt_TYPE_INTMAX_T], -+[ -+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) -+ AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, -+ [AC_TRY_COMPILE([ -+#include <stddef.h> -+#include <stdlib.h> -+#if HAVE_STDINT_H_WITH_UINTMAX -+#include <stdint.h> -+#endif -+#if HAVE_INTTYPES_H_WITH_UINTMAX -+#include <inttypes.h> -+#endif -+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) -+ if test $gt_cv_c_intmax_t = yes; then -+ AC_DEFINE(HAVE_INTMAX_T, 1, -+ [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/inttypes-pri.m4 util-linux-ng-2.15/m4/inttypes-pri.m4 ---- util-linux-ng-2.15.orig/m4/inttypes-pri.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/inttypes-pri.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,32 @@ -+# inttypes-pri.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* -+# macros to non-string values. This is the case on AIX 4.3.3. -+ -+AC_DEFUN([gt_INTTYPES_PRI], -+[ -+ AC_REQUIRE([gt_HEADER_INTTYPES_H]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], -+ gt_cv_inttypes_pri_broken, -+ [ -+ AC_TRY_COMPILE([#include <inttypes.h> -+#ifdef PRId32 -+char *p = PRId32; -+#endif -+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) -+ ]) -+ fi -+ if test "$gt_cv_inttypes_pri_broken" = yes; then -+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, -+ [Define if <inttypes.h> exists and defines unusable PRI* macros.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/inttypes.m4 util-linux-ng-2.15/m4/inttypes.m4 ---- util-linux-ng-2.15.orig/m4/inttypes.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/inttypes.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,27 @@ -+# inttypes.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with -+# <sys/types.h>. -+ -+AC_DEFUN([gt_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, -+ [ -+ AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <inttypes.h>], -+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) -+ ]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, -+ [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/inttypes_h.m4 util-linux-ng-2.15/m4/inttypes_h.m4 ---- util-linux-ng-2.15.orig/m4/inttypes_h.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/inttypes_h.m4 2009-05-11 21:27:05.000000000 +0000 -@@ -0,0 +1,28 @@ -+# inttypes_h.m4 serial 5 (gettext-0.12) -+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists, -+# doesn't clash with <sys/types.h>, and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <inttypes.h>], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+ [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, -+ and declares uintmax_t. ]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/isc-posix.m4 util-linux-ng-2.15/m4/isc-posix.m4 ---- util-linux-ng-2.15.orig/m4/isc-posix.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/isc-posix.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,26 @@ -+# isc-posix.m4 serial 2 (gettext-0.11.2) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -+ -+# This test replaces the one in autoconf. -+# Currently this macro should have the same name as the autoconf macro -+# because gettext's gettext.m4 (distributed in the automake package) -+# still uses it. Otherwise, the use in gettext.m4 makes autoheader -+# give these diagnostics: -+# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -+# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -+ -+undefine([AC_ISC_POSIX]) -+ -+AC_DEFUN([AC_ISC_POSIX], -+ [ -+ dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -+ AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -+ ] -+) -diff -Naur util-linux-ng-2.15.orig/m4/lcmessage.m4 util-linux-ng-2.15/m4/lcmessage.m4 ---- util-linux-ng-2.15.orig/m4/lcmessage.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/lcmessage.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,32 @@ -+# lcmessage.m4 serial 3 (gettext-0.11.3) -+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are *not* in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper <[email protected]>, 1995. -+ -+# Check whether LC_MESSAGES is available in <locale.h>. -+ -+AC_DEFUN([AM_LC_MESSAGES], -+[ -+ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, -+ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], -+ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ AC_DEFINE(HAVE_LC_MESSAGES, 1, -+ [Define if your <locale.h> file defines LC_MESSAGES.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/longdouble.m4 util-linux-ng-2.15/m4/longdouble.m4 ---- util-linux-ng-2.15.orig/m4/longdouble.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/longdouble.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,30 @@ -+# longdouble.m4 serial 1 (gettext-0.12) -+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+dnl Test whether the compiler supports the 'long double' type. -+dnl Prerequisite: AC_PROG_CC -+ -+AC_DEFUN([gt_TYPE_LONGDOUBLE], -+[ -+ AC_CACHE_CHECK([for long double], gt_cv_c_long_double, -+ [if test "$GCC" = yes; then -+ gt_cv_c_long_double=yes -+ else -+ AC_TRY_COMPILE([ -+ /* The Stardent Vistra knows sizeof(long double), but does not support it. */ -+ long double foo = 0.0; -+ /* On Ultrix 4.3 cc, long double is 4 and double is 8. */ -+ int array [2*(sizeof(long double) >= sizeof(double)) - 1]; -+ ], , -+ gt_cv_c_long_double=yes, gt_cv_c_long_double=no) -+ fi]) -+ if test $gt_cv_c_long_double = yes; then -+ AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/longlong.m4 util-linux-ng-2.15/m4/longlong.m4 ---- util-linux-ng-2.15.orig/m4/longlong.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/longlong.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,25 @@ -+# longlong.m4 serial 4 -+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_LONG_LONG if 'long long' works. -+ -+AC_DEFUN([jm_AC_TYPE_LONG_LONG], -+[ -+ AC_CACHE_CHECK([for long long], ac_cv_type_long_long, -+ [AC_TRY_LINK([long long ll = 1LL; int i = 63;], -+ [long long llmax = (long long) -1; -+ return ll << i | ll >> i | llmax / ll | llmax % ll;], -+ ac_cv_type_long_long=yes, -+ ac_cv_type_long_long=no)]) -+ if test $ac_cv_type_long_long = yes; then -+ AC_DEFINE(HAVE_LONG_LONG, 1, -+ [Define if you have the 'long long' type.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/printf-posix.m4 util-linux-ng-2.15/m4/printf-posix.m4 ---- util-linux-ng-2.15.orig/m4/printf-posix.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/printf-posix.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,46 @@ -+# printf-posix.m4 serial 2 (gettext-0.13.1) -+dnl Copyright (C) 2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+dnl Test whether the printf() function supports POSIX/XSI format strings with -+dnl positions. -+ -+AC_DEFUN([gt_PRINTF_POSIX], -+[ -+ AC_REQUIRE([AC_PROG_CC]) -+ AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings], -+ gt_cv_func_printf_posix, -+ [ -+ AC_TRY_RUN([ -+#include <stdio.h> -+#include <string.h> -+/* The string "%2$d %1$d", with dollar characters protected from the shell's -+ dollar expansion (possibly an autoconf bug). */ -+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' }; -+static char buf[100]; -+int main () -+{ -+ sprintf (buf, format, 33, 55); -+ return (strcmp (buf, "55 33") != 0); -+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, -+ [ -+ AC_EGREP_CPP(notposix, [ -+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ -+ notposix -+#endif -+ ], gt_cv_func_printf_posix="guessing no", -+ gt_cv_func_printf_posix="guessing yes") -+ ]) -+ ]) -+ case $gt_cv_func_printf_posix in -+ *yes) -+ AC_DEFINE(HAVE_POSIX_PRINTF, 1, -+ [Define if your printf() function supports format strings with positions.]) -+ ;; -+ esac -+]) -diff -Naur util-linux-ng-2.15.orig/m4/signed.m4 util-linux-ng-2.15/m4/signed.m4 ---- util-linux-ng-2.15.orig/m4/signed.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/signed.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,19 @@ -+# signed.m4 serial 1 (gettext-0.10.40) -+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([bh_C_SIGNED], -+[ -+ AC_CACHE_CHECK([for signed], bh_cv_c_signed, -+ [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)]) -+ if test $bh_cv_c_signed = no; then -+ AC_DEFINE(signed, , -+ [Define to empty if the C compiler doesn't support this keyword.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/size_max.m4 util-linux-ng-2.15/m4/size_max.m4 ---- util-linux-ng-2.15.orig/m4/size_max.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/size_max.m4 2009-05-11 21:27:06.000000000 +0000 -@@ -0,0 +1,61 @@ -+# size_max.m4 serial 2 -+dnl Copyright (C) 2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+AC_DEFUN([gl_SIZE_MAX], -+[ -+ AC_CHECK_HEADERS(stdint.h) -+ dnl First test whether the system already has SIZE_MAX. -+ AC_MSG_CHECKING([for SIZE_MAX]) -+ result= -+ AC_EGREP_CPP([Found it], [ -+#include <limits.h> -+#if HAVE_STDINT_H -+#include <stdint.h> -+#endif -+#ifdef SIZE_MAX -+Found it -+#endif -+], result=yes) -+ if test -z "$result"; then -+ dnl Define it ourselves. Here we assume that the type 'size_t' is not wider -+ dnl than the type 'unsigned long'. -+ dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr', -+ dnl which is guaranteed to work from LONG_MIN to LONG_MAX. -+ _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi, -+ [#include <stddef.h>], result=?) -+ _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo, -+ [#include <stddef.h>], result=?) -+ _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint, -+ [#include <stddef.h>], result=?) -+ if test "$fits_in_uint" = 1; then -+ dnl Even though SIZE_MAX fits in an unsigned int, it must be of type -+ dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'. -+ AC_TRY_COMPILE([#include <stddef.h> -+ extern size_t foo; -+ extern unsigned long foo; -+ ], [], fits_in_uint=0) -+ fi -+ if test -z "$result"; then -+ if test "$fits_in_uint" = 1; then -+ result="$res_hi$res_lo"U -+ else -+ result="$res_hi$res_lo"UL -+ fi -+ else -+ dnl Shouldn't happen, but who knows... -+ result='~(size_t)0' -+ fi -+ fi -+ AC_MSG_RESULT([$result]) -+ if test "$result" != yes; then -+ AC_DEFINE_UNQUOTED([SIZE_MAX], [$result], -+ [Define as the maximum value of type 'size_t', if the system doesn't define it.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/stdint_h.m4 util-linux-ng-2.15/m4/stdint_h.m4 ---- util-linux-ng-2.15.orig/m4/stdint_h.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/stdint_h.m4 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,28 @@ -+# stdint_h.m4 serial 3 (gettext-0.12) -+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, -+# doesn't clash with <sys/types.h>, and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_STDINT_H], -+[ -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include <sys/types.h> -+#include <stdint.h>], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+ [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, -+ and declares uintmax_t. ]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/uintmax_t.m4 util-linux-ng-2.15/m4/uintmax_t.m4 ---- util-linux-ng-2.15.orig/m4/uintmax_t.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/uintmax_t.m4 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,32 @@ -+# uintmax_t.m4 serial 7 (gettext-0.12) -+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+AC_PREREQ(2.13) -+ -+# Define uintmax_t to 'unsigned long' or 'unsigned long long' -+# if it is not already defined in <stdint.h> or <inttypes.h>. -+ -+AC_DEFUN([jm_AC_TYPE_UINTMAX_T], -+[ -+ AC_REQUIRE([jm_AC_HEADER_INTTYPES_H]) -+ AC_REQUIRE([jm_AC_HEADER_STDINT_H]) -+ if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = no; then -+ AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG]) -+ test $ac_cv_type_unsigned_long_long = yes \ -+ && ac_type='unsigned long long' \ -+ || ac_type='unsigned long' -+ AC_DEFINE_UNQUOTED(uintmax_t, $ac_type, -+ [Define to unsigned long or unsigned long long -+ if <stdint.h> and <inttypes.h> don't define.]) -+ else -+ AC_DEFINE(HAVE_UINTMAX_T, 1, -+ [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/ulonglong.m4 util-linux-ng-2.15/m4/ulonglong.m4 ---- util-linux-ng-2.15.orig/m4/ulonglong.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/ulonglong.m4 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,25 @@ -+# ulonglong.m4 serial 3 -+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. -+ -+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -+[ -+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, -+ [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], -+ [unsigned long long ullmax = (unsigned long long) -1; -+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;], -+ ac_cv_type_unsigned_long_long=yes, -+ ac_cv_type_unsigned_long_long=no)]) -+ if test $ac_cv_type_unsigned_long_long = yes; then -+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, -+ [Define if you have the 'unsigned long long' type.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/wchar_t.m4 util-linux-ng-2.15/m4/wchar_t.m4 ---- util-linux-ng-2.15.orig/m4/wchar_t.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/wchar_t.m4 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,22 @@ -+# wchar_t.m4 serial 1 (gettext-0.12) -+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+dnl Test whether <stddef.h> has the 'wchar_t' type. -+dnl Prerequisite: AC_PROG_CC -+ -+AC_DEFUN([gt_TYPE_WCHAR_T], -+[ -+ AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t, -+ [AC_TRY_COMPILE([#include <stddef.h> -+ wchar_t foo = (wchar_t)'\0';], , -+ gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)]) -+ if test $gt_cv_c_wchar_t = yes; then -+ AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/wint_t.m4 util-linux-ng-2.15/m4/wint_t.m4 ---- util-linux-ng-2.15.orig/m4/wint_t.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/wint_t.m4 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,22 @@ -+# wint_t.m4 serial 1 (gettext-0.12) -+dnl Copyright (C) 2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+dnl Test whether <wchar.h> has the 'wint_t' type. -+dnl Prerequisite: AC_PROG_CC -+ -+AC_DEFUN([gt_TYPE_WINT_T], -+[ -+ AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t, -+ [AC_TRY_COMPILE([#include <wchar.h> -+ wint_t foo = (wchar_t)'\0';], , -+ gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)]) -+ if test $gt_cv_c_wint_t = yes; then -+ AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.]) -+ fi -+]) -diff -Naur util-linux-ng-2.15.orig/m4/xsize.m4 util-linux-ng-2.15/m4/xsize.m4 ---- util-linux-ng-2.15.orig/m4/xsize.m4 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/m4/xsize.m4 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,14 @@ -+# xsize.m4 serial 2 -+dnl Copyright (C) 2003 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+AC_DEFUN([gl_XSIZE], -+[ -+ dnl Prerequisites of lib/xsize.h. -+ AC_REQUIRE([gl_SIZE_MAX]) -+ AC_CHECK_HEADERS(stdint.h) -+]) -diff -Naur util-linux-ng-2.15.orig/po/Makevars.template util-linux-ng-2.15/po/Makevars.template ---- util-linux-ng-2.15.orig/po/Makevars.template 1970-01-01 00:00:00.000000000 +0000 -+++ util-linux-ng-2.15/po/Makevars.template 2009-05-11 21:27:07.000000000 +0000 -@@ -0,0 +1,41 @@ -+# Makefile variables for PO directory in any package using GNU gettext. -+ -+# Usually the message domain is the same as the package name. -+DOMAIN = $(PACKAGE) -+ -+# These two variables depend on the location of this directory. -+subdir = po -+top_builddir = .. -+ -+# These options get passed to xgettext. -+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ -+ -+# This is the copyright holder that gets inserted into the header of the -+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -+# package. (Note that the msgstr strings, extracted from the package's -+# sources, belong to the copyright holder of the package.) Translators are -+# expected to transfer the copyright for their translations to this person -+# or entity, or to disclaim their copyright. The empty string stands for -+# the public domain; in this case the translators are expected to disclaim -+# their copyright. -+COPYRIGHT_HOLDER = Free Software Foundation, Inc. -+ -+# This is the email address or URL to which the translators shall report -+# bugs in the untranslated strings: -+# - Strings which are not entire sentences, see the maintainer guidelines -+# in the GNU gettext documentation, section 'Preparing Strings'. -+# - Strings which use unclear terms or require additional context to be -+# understood. -+# - Strings which make invalid assumptions about notation of date, time or -+# money. -+# - Pluralisation problems. -+# - Incorrect English spelling. -+# - Incorrect formatting. -+# It can be your email address, or a mailing list address where translators -+# can write to without being subscribed, or the URL of a web page through -+# which the translators can contact you. -+MSGID_BUGS_ADDRESS = -+ -+# This is the list of locale categories, beyond LC_MESSAGES, for which the -+# message catalogs shall be used. It is usually empty. -+EXTRA_LOCALE_CATEGORIES = Deleted: trunk/util-linux-ng/util-linux-ng-2.15-compile_fix-1.patch =================================================================== --- trunk/util-linux-ng/util-linux-ng-2.15-compile_fix-1.patch 2009-05-17 20:45:43 UTC (rev 2080) +++ trunk/util-linux-ng/util-linux-ng-2.15-compile_fix-1.patch 2009-05-17 20:46:57 UTC (rev 2081) @@ -1,19 +0,0 @@ -Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> -Date: 2009-05-11 -Initial Package Version: 2.15 -Upstream Status: From Upstream -Origin: Upstream -Description: Fixes a compilation error triggered by - 'make -C mount mount'. - -diff -Naur util-linux-ng-2.15.orig/config/include-Makefile.am util-linux-ng-2.15/config/include-Makefile.am ---- util-linux-ng-2.15.orig/config/include-Makefile.am 2009-03-25 12:20:16.000000000 +0000 -+++ util-linux-ng-2.15/config/include-Makefile.am 2009-05-11 18:32:49.000000000 +0000 -@@ -17,6 +17,7 @@ - # Paths to in-tree libraries (use ul_ prefix to avoid possible collisions) - # - ul_libblkid_srcdir = $(top_srcdir)/libs/blkid/src -+ul_libblkid_builddir = $(top_builddir)/libs/blkid/src - ul_libblkid_la = $(top_builddir)/libs/blkid/src/libblkid.la - - $(ul_libblkid_la): -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
