mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-12 04:58:32 +03:00
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
This commit is contained in:
parent
0e867555bd
commit
4825b521e2
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,4 @@
|
|||||||
!/m4/compiler-flags.m4
|
!/m4/virt-*.m4
|
||||||
!/po/*.po
|
!/po/*.po
|
||||||
!/po/POTFILES.in
|
!/po/POTFILES.in
|
||||||
!/po/libvirt.pot
|
!/po/libvirt.pot
|
||||||
|
@ -132,28 +132,3 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
|
|||||||
AC_SUBST(WARN_PYTHON_CFLAGS)
|
AC_SUBST(WARN_PYTHON_CFLAGS)
|
||||||
WARN_CFLAGS=$save_WARN_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
|
|
||||||
])])
|
|
23
m4/virt-pkgconfig-back-compat.m4
Normal file
23
m4/virt-pkgconfig-back-compat.m4
Normal file
@ -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
|
||||||
|
])])
|
Loading…
x
Reference in New Issue
Block a user