[Parted-commits] GNU Parted Official Repository: Changes to 'master'
Jim Meyering
meyering at alioth.debian.org
Tue Mar 30 12:03:25 UTC 2010
cfg.mk | 3 ++-
configure.ac | 7 ++++---
doc/parted.texi | 1 +
gnulib | 2 +-
libparted/disk.c | 1 -
parted/Makefile.am | 3 +++
tests/lvm-utils.sh | 6 +++---
7 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 5708086e79750a37e21197eaa375e6990d672df2
Author: Colin Watson <cjwatson at ubuntu.com>
Date: Tue Mar 30 10:55:42 2010 +0100
doc: add @dircategory to Info documentation
The Texinfo documentation says that Info files should use @dircategory,
and suggests consulting the Free Software Directory to select a category
name. The directory places Parted under "System administration".
* doc/parted.texi: Add `@dircategory System administration'.
diff --git a/doc/parted.texi b/doc/parted.texi
index 1a9a72f..885f312 100644
--- a/doc/parted.texi
+++ b/doc/parted.texi
@@ -29,6 +29,7 @@ Free Documentation License''.
@end ifplaintext
@end ifnottex
+ at dircategory System administration
@direntry
* parted: (parted). GNU partitioning software
@end direntry
commit 5f7c85479f99567592e436222a5468d87bba5277
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Mar 30 12:13:11 2010 +0200
build: update gnulib submodule to latest
diff --git a/gnulib b/gnulib
index 80cd995..e046ffb 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 80cd995cdcbf4b9ded895a43621a11f11806ad8d
+Subproject commit e046ffb123d352dec87f91fc638490572ef4d31d
commit c73e2aa9ccfacd9dc1a90a2ec819d669212bdc32
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Mar 30 12:23:16 2010 +0200
tests: disable new texinfo-acronym syntax-check from gnulib
* cfg.mk (local-checks-to-skip): Add new sc_texinfo_acronym, to skip it.
diff --git a/cfg.mk b/cfg.mk
index dc68a03..e303fa5 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -36,7 +36,8 @@ local-checks-to-skip = \
sc_prohibit_strcmp \
sc_prohibit_atoi_atof \
sc_require_test_exit_idiom \
- sc_space_tab
+ sc_space_tab \
+ sc_texinfo_acronym
# Now that we have better (check.mk) tests, make this the default.
export VERBOSE = yes
commit 7228b740796c18b5300e9f4987f9979621f57333
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Mar 30 12:22:10 2010 +0200
maint: avoid using test's -o and -a operators: they are not portable
* tests/lvm-utils.sh: Don't use test ... -o.
* configure.ac: Don't use test ... -a.
diff --git a/configure.ac b/configure.ac
index d4a2fa8..ceecacf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,8 @@ AC_ARG_ENABLE([dynamic-loading],
enable_dynamic_loading=yes
fi
)
-if test "$enable_discover_only" = yes -a "$enable_dynamic_loading" = yes; then
+if test "$enable_discover_only" = yes \
+ && test "$enable_dynamic_loading" = yes; then
AC_MSG_ERROR(
[You can't use --enable-dynamic-loading and --disable-discover-only together]
)
@@ -282,7 +283,7 @@ AC_CHECK_SIZEOF([off_t], [64], [
])
AM_ENABLE_SHARED
-if test "$OS" = linux -a $ac_cv_sizeof_off_t -lt 8; then
+if test "$OS" = linux && test $ac_cv_sizeof_off_t -lt 8; then
dnl Need to disable shared libraries, to get llseek() to work. Long
dnl story. The short story is: lseek() isn't in glibc, so a syscall
dnl must be made. syscalls can't be made from within shared libraries,
@@ -363,7 +364,7 @@ AC_SUBST([SELINUX_LIBS])
dnl Check for libreiserfs
REISER_LIBS=""
-if test "$enable_dynamic_loading" = no -a "$enable_discover_only" = no; then
+if test "$enable_dynamic_loading" = no && test "$enable_discover_only" = no; then
OLD_LIBS="$LIBS"
AC_CHECK_LIB([dal], [dal_equals],
LIBS="-ldal"
diff --git a/tests/lvm-utils.sh b/tests/lvm-utils.sh
index 0730ea2..37733e1 100644
--- a/tests/lvm-utils.sh
+++ b/tests/lvm-utils.sh
@@ -1,7 +1,7 @@
# Put lvm-related utilities here.
# This file is sourced from test-lib.sh.
-# Copyright (C) 2007-2009 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2007-2010 Red Hat, Inc. All rights reserved.
#
# This copyrighted material is made available to anyone wishing to use,
# modify, copy, or redistribute it subject to the terms and conditions
@@ -149,8 +149,8 @@ dmsetup_has_dm_devdir_support_()
# Detect support for the envvar. If it's supported, the
# following command will fail with the expected diagnostic.
out=$(DM_DEV_DIR=j dmsetup version 2>&1)
- test "$?:$out" = "1:Invalid DM_DEV_DIR envvar value." -o \
- "$?:$out" = "1:Invalid DM_DEV_DIR environment variable value."
+ test "$?:$out" = "1:Invalid DM_DEV_DIR envvar value." ||
+ test "$?:$out" = "1:Invalid DM_DEV_DIR environment variable value."
}
# set up private /dev and /etc
commit 8e23469d9e4bb62ab2427b589dac1d75a8af2639
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Mar 30 12:19:06 2010 +0200
maint: remove unneeded #include
* libparted/disk.c: Don't include "intprops.h". It was unused.
diff --git a/libparted/disk.c b/libparted/disk.c
index fc5ef17..f4c0d74 100644
--- a/libparted/disk.c
+++ b/libparted/disk.c
@@ -39,7 +39,6 @@
#include <stdbool.h>
#include "architecture.h"
-#include "intprops.h"
#include "labels/pt-tools.h"
#if ENABLE_NLS
commit b4e29160da3d8fd605b69b586e13b76f6289f9a0
Author: Jim Meyering <meyering at redhat.com>
Date: Tue Mar 30 12:18:35 2010 +0200
build: prepare for gnulib's updated lib-ignore
* parted/Makefile.am (parted_LDFLAGS): Now that we're using
gnulib's newer lib-ignore, add $(IGNORE_UNUSED_LIBRARIES_CFLAGS).
diff --git a/parted/Makefile.am b/parted/Makefile.am
index f407598..96bd109 100644
--- a/parted/Makefile.am
+++ b/parted/Makefile.am
@@ -23,6 +23,9 @@ parted_LDADD = \
parted_LDFLAGS = $(PARTEDLDFLAGS)
+# Tell the linker to omit references to unused shared libraries.
+parted_LDFLAGS += $(IGNORE_UNUSED_LIBRARIES_CFLAGS)
+
INCLUDES = $(partedincludedir) $(INTLINCS)
MAINTAINERCLEANFILES = Makefile.in
More information about the Parted-commits
mailing list