From 4825b521e2801f6ccceee182d61b4a8e99b843c3 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 4 Apr 2011 14:40:34 +0100
Subject: [PATCH] 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                                  |  2 +-
 acinclude.m4 => m4/virt-compile-warnings.m4 | 25 ---------------------
 m4/virt-pkgconfig-back-compat.m4            | 23 +++++++++++++++++++
 3 files changed, 24 insertions(+), 26 deletions(-)
 rename acinclude.m4 => m4/virt-compile-warnings.m4 (86%)
 create mode 100644 m4/virt-pkgconfig-back-compat.m4

diff --git a/.gitignore b/.gitignore
index ba4d351d16..24c96b5275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-!/m4/compiler-flags.m4
+!/m4/virt-*.m4
 !/po/*.po
 !/po/POTFILES.in
 !/po/libvirt.pot
diff --git a/acinclude.m4 b/m4/virt-compile-warnings.m4
similarity index 86%
rename from acinclude.m4
rename to m4/virt-compile-warnings.m4
index 1182e256bc..9dbc90e0ee 100644
--- a/acinclude.m4
+++ b/m4/virt-compile-warnings.m4
@@ -132,28 +132,3 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
     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-pkgconfig-back-compat.m4 b/m4/virt-pkgconfig-back-compat.m4
new file mode 100644
index 0000000000..7eab84b72a
--- /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
+])])