diff options
author | Jim Meyering <meyering@redhat.com> | 2011-05-17 23:08:42 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2011-05-27 17:07:46 +0200 |
commit | 374cf226c3f4ae42d1166bcb870e9b3c1496631d (patch) | |
tree | f81ab716d91527a23a150be005c27db855ac1a4b | |
parent | 01be9b6af3d0af63ff453ef6f27813b18811a949 (diff) | |
download | parted-374cf226c3f4ae42d1166bcb870e9b3c1496631d.tar.gz |
build: remove configure-time options: --disable-fs, --enable-Werror
* configure.ac: Remove support for --enable-fs and --disable-fs.
Remove support for --enable-Werror and --disable-Werror.
* README: Remove paragraph about --disable-fs and
--enable-discovery-only.
* libparted/libparted.c: Now that --disable-fs is gone (i.e.,
ENABLE_FS would be always 1), remove its #ifdefs.
-rw-r--r-- | README | 7 | ||||
-rw-r--r-- | configure.ac | 20 | ||||
-rw-r--r-- | libparted/libparted.c | 11 |
3 files changed, 0 insertions, 38 deletions
@@ -68,10 +68,3 @@ not a "requires". (3) When space is important, we suggest --without-readline, --disable-shared, and possibly --disable-nls and --disable-dynamic-loading. - -If Parted is only going to be used for probing / discovery (and not -"editing"), there is a --enable-discovery-only and --disable-fs (when you're -only interested in partition tables). Since it's readonly, --enable-debug -gains you nothing wrt safety, so use --disable-debug ;) The "discover" -program is about 35k (gzipped) when compiled this way (not counting libc -and libuuid). diff --git a/configure.ac b/configure.ac index 76ac8a8..ce2b3b5 100644 --- a/configure.ac +++ b/configure.ac @@ -117,15 +117,6 @@ if test "$enable_discover_only" = yes \ ) fi -AC_ARG_ENABLE([fs], - [ --enable-fs include filesystem support [default=yes]], , - enable_fs=yes -) -if test "$enable_fs" = yes; then - AC_DEFINE([ENABLE_FS], [1], - [Include file system support. i.e. libparted/fs_...]) -fi - AC_ARG_ENABLE([debug], [ --enable-debug compile in assertions [default=yes]], , enable_debug=yes @@ -157,11 +148,6 @@ if test "$enable_pc98" = yes; then collisions with msdos partition tables]) fi -AC_ARG_ENABLE([Werror], - [ --enable-Werror build with gcc -Werror [default=yes]], , - enable_Werror=yes -) - AC_ARG_ENABLE([hfs-extract-fs], [ --enable-hfs-extract-fs Extract special HFS files for debugging [default=no]], , enable_hfs_extract_fs=no @@ -593,12 +579,6 @@ fi AC_CHECK_FUNCS([canonicalize_file_name]) -# CFLAGS="$CFLAGS -W -Wall -Wno-unused -Wno-switch -Wno-format" - -if test "$enable_Werror" = yes; then - CFLAGS="$CFLAGS -Werror" -fi - DATE=$(date '+%d %b %Y %H:%M') USER=$(whoami) HOST=$(hostname) diff --git a/libparted/libparted.c b/libparted/libparted.c index db1c413..fe617bd 100644 --- a/libparted/libparted.c +++ b/libparted/libparted.c @@ -98,7 +98,6 @@ init_disk_types () ped_disk_aix_init (); } -#ifdef ENABLE_FS extern void ped_file_system_amiga_init (void); extern void ped_file_system_xfs_init (void); extern void ped_file_system_ufs_init (void); @@ -126,7 +125,6 @@ init_file_system_types () ped_file_system_ext2_init (); ped_file_system_nilfs2_init (); } -#endif /* ENABLE_FS */ extern void ped_disk_aix_done (); extern void ped_disk_bsd_done (); @@ -170,17 +168,13 @@ _init() #endif init_disk_types (); - -#ifdef ENABLE_FS init_file_system_types (); -#endif ped_set_architecture (); #ifdef DEBUG memset (dodgy_memory_active, 0, sizeof (dodgy_memory_active)); #endif } -#ifdef ENABLE_FS extern void ped_file_system_nilfs2_done (void); extern void ped_file_system_ext2_done (void); extern void ped_file_system_fat_done (void); @@ -208,7 +202,6 @@ done_file_system_types () ped_file_system_xfs_done (); ped_file_system_amiga_done (); } -#endif /* ENABLE_FS */ static void _done() __attribute__ ((destructor)); @@ -216,12 +209,8 @@ static void _done() { ped_device_free_all (); - done_disk_types (); - -#ifdef ENABLE_FS done_file_system_types (); -#endif } const char* |