diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/glib-2.0.m4 | 22 | ||||
| -rw-r--r-- | m4/libtool.m4 | 2 | ||||
| -rw-r--r-- | m4/pkg.m4 | 8 |
3 files changed, 16 insertions, 16 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 : diff --git a/m4/libtool.m4 b/m4/libtool.m4 index ff871a0a..0d340c73 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -34,7 +34,7 @@ m4_define([_LT_COPYING], [dnl # # You should have received a copy of the GNU General Public License # along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +# can be downloaded from https://www.gnu.org/licenses/gpl.html, or # obtained by writing to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ]) @@ -1,5 +1,5 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# # Copyright © 2004 Scott James Remnant <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -39,7 +39,7 @@ if test -n "$PKG_CONFIG"; then AC_MSG_RESULT([no]) PKG_CONFIG="" fi - + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -120,7 +120,7 @@ if test $pkg_failed = yes; then _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs @@ -146,7 +146,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +To get pkg-config, see <https://www.freedesktop.org/software/pkgconfig>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |