[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/6] Remove acinclude.m4 file



Split the bit acinclude.m4 file into smaller pieces named
as m4/virt-XXXXX.m4

* .gitignore: Ignore gettext related files
* acinclude.m4: Delete
* m4/virt-compile-warnings.m4: Checks for GCC compiler flags
* m4/virt-pkgconfig-back-compat.m4: Backcompat check for
  pkgconfig program
---
 .gitignore                       |   36 +++++++++-
 acinclude.m4                     |  137 --------------------------------------
 m4/virt-compile-warnings.m4      |  112 +++++++++++++++++++++++++++++++
 m4/virt-pkgconfig-back-compat.m4 |   23 ++++++
 4 files changed, 169 insertions(+), 139 deletions(-)
 delete mode 100644 acinclude.m4
 create mode 100644 m4/virt-compile-warnings.m4
 create mode 100644 m4/virt-pkgconfig-back-compat.m4

diff --git a/.gitignore b/.gitignore
index ba4d351..278bc4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-!/m4/compiler-flags.m4
 !/po/*.po
 !/po/POTFILES.in
 !/po/libvirt.pot
@@ -46,7 +45,6 @@
 /libvirt.spec
 /ltconfig
 /ltmain.sh
-/m4/
 /maint.mk
 /mingw32-libvirt.spec
 /mkinstalldirs
@@ -67,3 +65,37 @@ results.log
 stamp-h
 stamp-h.in
 stamp-h1
+m4/codeset.m4
+m4/gettext.m4
+m4/glibc21.m4
+m4/iconv.m4
+m4/intdiv0.m4
+m4/intmax.m4
+m4/inttypes_h.m4
+m4/inttypes.m4
+m4/inttypes-pri.m4
+m4/isc-posix.m4
+m4/lcmessage.m4
+m4/lib-ld.m4
+m4/lib-link.m4
+m4/lib-prefix.m4
+m4/libtool.m4
+m4/longdouble.m4
+m4/longlong.m4
+m4/lt~obsolete.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/nls.m4
+m4/po.m4
+m4/printf-posix.m4
+m4/progtest.m4
+m4/signed.m4
+m4/size_max.m4
+m4/stdint_h.m4
+m4/uintmax_t.m4
+m4/ulonglong.m4
+m4/wchar_t.m4
+m4/wint_t.m4
+m4/xsize.m4
+m4/.gitignore
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 8eb0ec5..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,137 +0,0 @@
-dnl
-dnl Enable all known GCC compiler warnings, except for those
-dnl we can't yet cope with
-dnl
-AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-    dnl ******************************
-    dnl More compiler warnings
-    dnl ******************************
-
-    AC_ARG_ENABLE(compile-warnings,
-                  [AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@],
-                                 [Turn on compiler warnings])],,
-                  [enable_compile_warnings="m4_default([$1],[yes])"])
-
-    case "$enable_compile_warnings" in
-    no)
-        try_compiler_flags=""
-	;;
-    yes|minimum|maximum|error)
-
-        # List of warnings that are not relevant / wanted
-        dontwarn="$dontwarn -Wc++-compat"             # Don't care about C++ compiler compat
-        dontwarn="$dontwarn -Wtraditional"            # Don't care about ancient C standard compat
-        dontwarn="$dontwarn -Wtraditional-conversion" # Don't care about ancient C standard compat
-        dontwarn="$dontwarn -Wsystem-headers"         # Ignore warnings in /usr/include
-        dontwarn="$dontwarn -Wpadded"                 # Happy for compiler to add struct padding
-        dontwarn="$dontwarn -Wunreachable-code"       # GCC very confused with -O2
-        dontwarn="$dontwarn -Wconversion"             # Too many to deal with
-        dontwarn="$dontwarn -Wsign-conversion"        # Too many to deal with
-        dontwarn="$dontwarn -Wvla"                    # GNULIB gettext.h violates
-        dontwarn="$dontwarn -Wundef"                  # Many GNULIB violations
-        dontwarn="$dontwarn -Wcast-qual"              # Need to allow bad cast for execve()
-        dontwarn="$dontwarn -Wlong-long"              # We need to use long long in many places
-        dontwarn="$dontwarn -Wswitch-default"         # We allow manual list of all enum cases without default:
-        dontwarn="$dontwarn -Wswitch-enum"            # We allow optional default: instead of listing all enum values
-        dontwarn="$dontwarn -Wstrict-overflow"        # Not a problem since we don't use -fstrict-overflow
-        dontwarn="$dontwarn -Wunsafe-loop-optimizations" # Not a problem since we don't use -funsafe-loop-optimizations
-
-        # We might fundamentally need some of these disabled forever, but ideally
-        # we'd turn many of them on
-        dontwarn="$dontwarn -Wformat-nonliteral"
-        dontwarn="$dontwarn -Wfloat-equal"
-        dontwarn="$dontwarn -Wdeclaration-after-statement"
-        dontwarn="$dontwarn -Wcast-qual"
-        dontwarn="$dontwarn -Wconversion"
-        dontwarn="$dontwarn -Wsign-conversion"
-        dontwarn="$dontwarn -Wold-style-definition"
-        dontwarn="$dontwarn -Wmissing-noreturn"
-        dontwarn="$dontwarn -Wpacked"
-        dontwarn="$dontwarn -Wunused-macros"
-        dontwarn="$dontwarn -Woverlength-strings"
-        dontwarn="$dontwarn -Wmissing-format-attribute"
-        dontwarn="$dontwarn -Wstack-protector"
-
-        # Get all possible GCC warnings
-        gl_MANYWARN_ALL_GCC([maybewarn])
-
-        # Remove the ones we don't want, blacklisted earlier
-        gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn])
-
-        # Check for $CC support of each warning
-        for w in $wantwarn; do
-          gl_WARN_ADD([$w])
-        done
-
-        # GNULIB uses '-W' which includes a bunch of stuff,
-        # kinda like -Wextra. Unfortunately, it means you
-        # can't simply use '-Wsign-compare' with gl_MANYWARN_COMPLEMENT
-        # So we have -W enabled, and then have to explicitly turn off
-        gl_WARN_ADD(-Wno-sign-compare)
-
-        # This should be < 256 really, but with PATH_MAX everywhere
-        # we have doom, even with 4096. In fact we have some functions
-        # with several PATH_MAX sized variables :-( We should kill off
-        # all PATH_MAX usage and then lower this limit
-        gl_WARN_ADD([-Wframe-larger-than=65700])
-        dnl gl_WARN_ADD([-Wframe-larger-than=4096])
-        dnl gl_WARN_ADD([-Wframe-larger-than=256])
-
-        # Extra special flags
-        gl_WARN_ADD([-Wp,-D_FORTIFY_SOURCE=2])
-        dnl Fedora only uses -fstack-protector, but doesn't seem to
-        dnl be great overhead in adding -fstack-protector-all instead
-        dnl gl_WARN_ADD([-fstack-protector])
-        gl_WARN_ADD([-fstack-protector-all])
-        gl_WARN_ADD([--param=ssp-buffer-size=4])
-        gl_WARN_ADD([-fexceptions])
-        gl_WARN_ADD([-fasynchronous-unwind-tables])
-        gl_WARN_ADD([-fdiagnostics-show-option])
-
-        if test "$enable_compile_warnings" = "error"
-        then
-          gl_WARN_ADD([-Werror])
-        fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-
-    WARN_LDFLAGS=$WARN_CFLAGS
-    AC_SUBST([WARN_CFLAGS])
-    AC_SUBST([WARN_LDFLAGS])
-
-    dnl Needed to keep compile quiet on python 2.4
-    save_WARN_CFLAGS=$WARN_CFLAGS
-    WARN_CFLAGS=
-    gl_WARN_ADD(-Wno-redundant-decls)
-    WARN_PYTHON_CFLAGS=$WARN_CFLAGS
-    AC_SUBST(WARN_PYTHON_CFLAGS)
-    WARN_CFLAGS=$save_WARN_CFLAGS
-])
-
-
-dnl
-dnl To support the old pkg-config from RHEL4 vintage, we need
-dnl to define the PKG_PROG_PKG_CONFIG macro if its not already
-dnl present
-m4_ifndef([PKG_PROG_PKG_CONFIG],
-  [AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-        _pkg_min_version=m4_default([$1], [0.9.0])
-        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-                AC_MSG_RESULT([yes])
-        else
-                AC_MSG_RESULT([no])
-                PKG_CONFIG=""
-        fi
-fi[]dnl
-])])
diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
new file mode 100644
index 0000000..f8ee474
--- /dev/null
+++ b/m4/virt-compile-warnings.m4
@@ -0,0 +1,112 @@
+dnl
+dnl Enable all known GCC compiler warnings, except for those
+dnl we can't yet cope with
+dnl
+AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
+    dnl ******************************
+    dnl More compiler warnings
+    dnl ******************************
+
+    AC_ARG_ENABLE(compile-warnings,
+                  [AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@],
+                                 [Turn on compiler warnings])],,
+                  [enable_compile_warnings="m4_default([$1],[yes])"])
+
+    case "$enable_compile_warnings" in
+    no)
+        try_compiler_flags=""
+	;;
+    yes|minimum|maximum|error)
+
+        # List of warnings that are not relevant / wanted
+        dontwarn="$dontwarn -Wc++-compat"             # Don't care about C++ compiler compat
+        dontwarn="$dontwarn -Wtraditional"            # Don't care about ancient C standard compat
+        dontwarn="$dontwarn -Wtraditional-conversion" # Don't care about ancient C standard compat
+        dontwarn="$dontwarn -Wsystem-headers"         # Ignore warnings in /usr/include
+        dontwarn="$dontwarn -Wpadded"                 # Happy for compiler to add struct padding
+        dontwarn="$dontwarn -Wunreachable-code"       # GCC very confused with -O2
+        dontwarn="$dontwarn -Wconversion"             # Too many to deal with
+        dontwarn="$dontwarn -Wsign-conversion"        # Too many to deal with
+        dontwarn="$dontwarn -Wvla"                    # GNULIB gettext.h violates
+        dontwarn="$dontwarn -Wundef"                  # Many GNULIB violations
+        dontwarn="$dontwarn -Wcast-qual"              # Need to allow bad cast for execve()
+        dontwarn="$dontwarn -Wlong-long"              # We need to use long long in many places
+        dontwarn="$dontwarn -Wswitch-default"         # We allow manual list of all enum cases without default:
+        dontwarn="$dontwarn -Wswitch-enum"            # We allow optional default: instead of listing all enum values
+        dontwarn="$dontwarn -Wstrict-overflow"        # Not a problem since we don't use -fstrict-overflow
+        dontwarn="$dontwarn -Wunsafe-loop-optimizations" # Not a problem since we don't use -funsafe-loop-optimizations
+
+        # We might fundamentally need some of these disabled forever, but ideally
+        # we'd turn many of them on
+        dontwarn="$dontwarn -Wformat-nonliteral"
+        dontwarn="$dontwarn -Wfloat-equal"
+        dontwarn="$dontwarn -Wdeclaration-after-statement"
+        dontwarn="$dontwarn -Wcast-qual"
+        dontwarn="$dontwarn -Wconversion"
+        dontwarn="$dontwarn -Wsign-conversion"
+        dontwarn="$dontwarn -Wold-style-definition"
+        dontwarn="$dontwarn -Wmissing-noreturn"
+        dontwarn="$dontwarn -Wpacked"
+        dontwarn="$dontwarn -Wunused-macros"
+        dontwarn="$dontwarn -Woverlength-strings"
+        dontwarn="$dontwarn -Wmissing-format-attribute"
+        dontwarn="$dontwarn -Wstack-protector"
+
+        # Get all possible GCC warnings
+        gl_MANYWARN_ALL_GCC([maybewarn])
+
+        # Remove the ones we don't want, blacklisted earlier
+        gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn])
+
+        # Check for $CC support of each warning
+        for w in $wantwarn; do
+          gl_WARN_ADD([$w])
+        done
+
+        # GNULIB uses '-W' which includes a bunch of stuff,
+        # kinda like -Wextra. Unfortunately, it means you
+        # can't simply use '-Wsign-compare' with gl_MANYWARN_COMPLEMENT
+        # So we have -W enabled, and then have to explicitly turn off
+        gl_WARN_ADD(-Wno-sign-compare)
+
+        # This should be < 256 really, but with PATH_MAX everywhere
+        # we have doom, even with 4096. In fact we have some functions
+        # with several PATH_MAX sized variables :-( We should kill off
+        # all PATH_MAX usage and then lower this limit
+        gl_WARN_ADD([-Wframe-larger-than=65700])
+        dnl gl_WARN_ADD([-Wframe-larger-than=4096])
+        dnl gl_WARN_ADD([-Wframe-larger-than=256])
+
+        # Extra special flags
+        gl_WARN_ADD([-Wp,-D_FORTIFY_SOURCE=2])
+        dnl Fedora only uses -fstack-protector, but doesn't seem to
+        dnl be great overhead in adding -fstack-protector-all instead
+        dnl gl_WARN_ADD([-fstack-protector])
+        gl_WARN_ADD([-fstack-protector-all])
+        gl_WARN_ADD([--param=ssp-buffer-size=4])
+        gl_WARN_ADD([-fexceptions])
+        gl_WARN_ADD([-fasynchronous-unwind-tables])
+        gl_WARN_ADD([-fdiagnostics-show-option])
+
+        if test "$enable_compile_warnings" = "error"
+        then
+          gl_WARN_ADD([-Werror])
+        fi
+	;;
+    *)
+	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+	;;
+    esac
+
+    WARN_LDFLAGS=$WARN_CFLAGS
+    AC_SUBST([WARN_CFLAGS])
+    AC_SUBST([WARN_LDFLAGS])
+
+    dnl Needed to keep compile quiet on python 2.4
+    save_WARN_CFLAGS=$WARN_CFLAGS
+    WARN_CFLAGS=
+    gl_WARN_ADD(-Wno-redundant-decls)
+    WARN_PYTHON_CFLAGS=$WARN_CFLAGS
+    AC_SUBST(WARN_PYTHON_CFLAGS)
+    WARN_CFLAGS=$save_WARN_CFLAGS
+])
diff --git a/m4/virt-pkgconfig-back-compat.m4 b/m4/virt-pkgconfig-back-compat.m4
new file mode 100644
index 0000000..7eab84b
--- /dev/null
+++ b/m4/virt-pkgconfig-back-compat.m4
@@ -0,0 +1,23 @@
+dnl
+dnl To support the old pkg-config from RHEL4 vintage, we need
+dnl to define the PKG_PROG_PKG_CONFIG macro if its not already
+dnl present
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+  [AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+        _pkg_min_version=m4_default([$1], [0.9.0])
+        AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+        if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+                AC_MSG_RESULT([yes])
+        else
+                AC_MSG_RESULT([no])
+                PKG_CONFIG=""
+        fi
+fi[]dnl
+])])
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]