diff options
author | Werner Koch <[email protected]> | 2016-11-16 12:27:00 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2016-11-16 12:27:00 +0000 |
commit | 7f5f26fd66e60e60de875c70b1f93f60c0438780 (patch) | |
tree | 198c1edb66e1c5b2a132635070d96bf81a65b381 /m4/glib-2.0.m4 | |
parent | core: Do not leak the override session key to ps(1). (diff) | |
download | gpgme-7f5f26fd66e60e60de875c70b1f93f60c0438780.tar.gz gpgme-7f5f26fd66e60e60de875c70b1f93f60c0438780.zip |
doc: Replace http: by https: in core source files.
--
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'm4/glib-2.0.m4')
-rw-r--r-- | m4/glib-2.0.m4 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4 index d6413ff7..a22e6e6d 100644 --- a/m4/glib-2.0.m4 +++ b/m4/glib-2.0.m4 @@ -2,11 +2,11 @@ # Owen Taylor 1997-2001 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or dnl gthread is specified in MODULES, pass to pkg-config dnl AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl +[dnl dnl Get the cflags and libraries from pkg-config dnl AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], @@ -16,16 +16,16 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run for module in . $4 do case "$module" in - gmodule) + gmodule) pkg_config_args="$pkg_config_args gmodule-2.0" ;; - gmodule-no-export) + gmodule-no-export) pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ;; - gobject) + gobject) pkg_config_args="$pkg_config_args gobject-2.0" ;; - gthread) + gthread) pkg_config_args="$pkg_config_args gthread-2.0" ;; esac @@ -92,7 +92,7 @@ dnl #include <stdio.h> #include <stdlib.h> -int +int main () { int major, minor, micro; @@ -111,7 +111,7 @@ main () (glib_minor_version != $glib_config_minor_version) || (glib_micro_version != $glib_config_micro_version)) { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, glib_major_version, glib_minor_version, glib_micro_version); printf ("*** was found! If pkg-config was correct, then it is best\n"); @@ -121,7 +121,7 @@ main () printf("*** required on your system.\n"); printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); printf("*** to point to the correct configuration files\n"); - } + } else if ((glib_major_version != GLIB_MAJOR_VERSION) || (glib_minor_version != GLIB_MINOR_VERSION) || (glib_micro_version != GLIB_MICRO_VERSION)) @@ -165,12 +165,12 @@ main () fi if test "x$no_glib" = x ; then AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) + ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) if test "$PKG_CONFIG" = "no" ; then echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" + echo "*** See https://www.freedesktop.org/software/pkgconfig/" else if test -f conf.glibtest ; then : |