diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-08-29 21:29:21 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-08-29 21:29:21 +0200 |
| commit | c1ab67b7288359066b4884d3058e712f6170da35 (patch) | |
| tree | 98f3586f2aa73bdae0d22e1e3667c4a70c28f232 /gphoto-m4 | |
| parent | f598d9e5e310a32ccf99070a9a9db103ff7b9a78 (diff) | |
| download | libgphoto2-c1ab67b7288359066b4884d3058e712f6170da35.tar.gz | |
remove gp_pkg_config macro, replace by standard pkg-config macro
Diffstat (limited to 'gphoto-m4')
| -rw-r--r-- | gphoto-m4/gp-check-library.m4 | 2 | ||||
| -rw-r--r-- | gphoto-m4/gp-pkg-config.m4 | 42 |
2 files changed, 1 insertions, 43 deletions
diff --git a/gphoto-m4/gp-check-library.m4 b/gphoto-m4/gp-check-library.m4 index bc97e19b0..2737d8d20 100644 --- a/gphoto-m4/gp-check-library.m4 +++ b/gphoto-m4/gp-check-library.m4 @@ -106,7 +106,7 @@ m4_ifval([$9],[dnl # ---------------------------------------------------------------------- dnl AC_REQUIRE([GP_CONFIG_MSG])dnl -AC_REQUIRE([GP_PKG_CONFIG])dnl +AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_REQUIRE([_GP_CHECK_LIBRARY_SOEXT])dnl # Use _CFLAGS and _LIBS given to configure. # This makes it possible to set these vars in a configure script diff --git a/gphoto-m4/gp-pkg-config.m4 b/gphoto-m4/gp-pkg-config.m4 deleted file mode 100644 index 531bfe476..000000000 --- a/gphoto-m4/gp-pkg-config.m4 +++ /dev/null @@ -1,42 +0,0 @@ -dnl @synopsis GP_PKG_CONFIG -dnl -dnl If you want to set the PKG_CONFIG_PATH, best do so before -dnl calling GP_PKG_CONFIG -AC_DEFUN([GP_PKG_CONFIG],[ -# -# [GP_PKG_CONFIG] -# -AC_ARG_VAR([PKG_CONFIG],[pkg-config package config utility]) -export PKG_CONFIG -AC_ARG_VAR([PKG_CONFIG_PATH],[directory where pkg-config looks for *.pc files]) -export PKG_CONFIG_PATH - -AC_MSG_CHECKING([PKG_CONFIG_PATH]) -if test "x${PKG_CONFIG_PATH}" = "x"; then - AC_MSG_RESULT([empty]) -else - AC_MSG_RESULT([${PKG_CONFIG_PATH}]) -fi - -dnl AC_REQUIRE([PKG_CHECK_MODULES]) -AC_PATH_PROG([PKG_CONFIG],[pkg-config],[false]) -if test "$PKG_CONFIG" = "false"; then -AC_MSG_ERROR([ -*** Build requires pkg-config -*** -*** Possible solutions: -*** - set PKG_CONFIG to where your pkg-config is located -*** - set PATH to include the directory where pkg-config is installed -*** - get it from http://freedesktop.org/software/pkgconfig/ and install it -]) -fi -])dnl - -dnl Please do not remove this: -dnl filetype: d87b877b-80ec-447c-b042-21ec4a27c6f0 -dnl I use this to find all the different instances of this file which -dnl are supposed to be synchronized. - -dnl Local Variables: -dnl mode: autoconf -dnl End: |