Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[xsrc/xorg]: xsrc/external/mit/mesa-demos/dist initial import of mesa-demos-8...



details:   https://anonhg.NetBSD.org/xsrc/rev/3bd4d3f2499b
branches:  xorg
changeset: 10214:3bd4d3f2499b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 11 06:59:37 2019 +0000

description:
initial import of mesa-demos-8.4.0

diffstat:

 external/mit/mesa-demos/dist/Makefile.in                          |    52 +-
 external/mit/mesa-demos/dist/aclocal.m4                           |   271 +-
 external/mit/mesa-demos/dist/compile                              |     2 +-
 external/mit/mesa-demos/dist/config.guess                         |   269 +-
 external/mit/mesa-demos/dist/config.sub                           |   132 +-
 external/mit/mesa-demos/dist/configure                            |  3310 +++--
 external/mit/mesa-demos/dist/configure.ac                         |    29 +-
 external/mit/mesa-demos/dist/depcomp                              |     6 +-
 external/mit/mesa-demos/dist/install-sh                           |   361 +-
 external/mit/mesa-demos/dist/ltmain.sh                            |  5817 ++++++---
 external/mit/mesa-demos/dist/m4/libtool.m4                        |  2544 ++-
 external/mit/mesa-demos/dist/m4/ltoptions.m4                      |   127 +-
 external/mit/mesa-demos/dist/m4/ltsugar.m4                        |     7 +-
 external/mit/mesa-demos/dist/m4/ltversion.m4                      |    12 +-
 external/mit/mesa-demos/dist/m4/lt~obsolete.m4                    |     7 +-
 external/mit/mesa-demos/dist/missing                              |     2 +-
 external/mit/mesa-demos/dist/src/Makefile.in                      |    24 +-
 external/mit/mesa-demos/dist/src/data/Makefile.in                 |    26 +-
 external/mit/mesa-demos/dist/src/demos/Makefile.in                |    25 +-
 external/mit/mesa-demos/dist/src/demos/fbo_firecube.c             |     3 +-
 external/mit/mesa-demos/dist/src/demos/fire.c                     |     1 +
 external/mit/mesa-demos/dist/src/demos/gears.c                    |     2 +
 external/mit/mesa-demos/dist/src/demos/teapot.c                   |     1 +
 external/mit/mesa-demos/dist/src/demos/terrain.c                  |     1 +
 external/mit/mesa-demos/dist/src/demos/trispd.c                   |     1 +
 external/mit/mesa-demos/dist/src/demos/tunnel.c                   |     1 +
 external/mit/mesa-demos/dist/src/demos/tunnel2.c                  |     1 +
 external/mit/mesa-demos/dist/src/egl/Makefile.in                  |    24 +-
 external/mit/mesa-demos/dist/src/egl/eglut/Makefile.am            |    10 +-
 external/mit/mesa-demos/dist/src/egl/eglut/Makefile.in            |    57 +-
 external/mit/mesa-demos/dist/src/egl/eglut/eglut.c                |     8 +-
 external/mit/mesa-demos/dist/src/egl/eglut/eglut_wayland.c        |    79 +-
 external/mit/mesa-demos/dist/src/egl/oes_vg/Makefile.in           |    25 +-
 external/mit/mesa-demos/dist/src/egl/opengl/Makefile.am           |    32 +-
 external/mit/mesa-demos/dist/src/egl/opengl/Makefile.in           |   185 +-
 external/mit/mesa-demos/dist/src/egl/opengl/eglinfo.c             |   132 +-
 external/mit/mesa-demos/dist/src/egl/opengles1/Makefile.am        |    14 -
 external/mit/mesa-demos/dist/src/egl/opengles1/Makefile.in        |    81 +-
 external/mit/mesa-demos/dist/src/egl/opengles1/torus.c            |     5 +
 external/mit/mesa-demos/dist/src/egl/opengles2/Makefile.am        |    10 +-
 external/mit/mesa-demos/dist/src/egl/opengles2/Makefile.in        |    61 +-
 external/mit/mesa-demos/dist/src/egl/opengles2/es2tri.c           |     2 +-
 external/mit/mesa-demos/dist/src/egl/openvg/Makefile.am           |     8 -
 external/mit/mesa-demos/dist/src/egl/openvg/Makefile.in           |    59 +-
 external/mit/mesa-demos/dist/src/egl/openvg/trivial/Makefile.in   |    25 +-
 external/mit/mesa-demos/dist/src/fp/Makefile.in                   |    25 +-
 external/mit/mesa-demos/dist/src/fp/fp-tri.c                      |     8 +-
 external/mit/mesa-demos/dist/src/fpglsl/Makefile.in               |    25 +-
 external/mit/mesa-demos/dist/src/glsl/Makefile.in                 |    25 +-
 external/mit/mesa-demos/dist/src/glsl/geom-stipple-lines.c        |    59 +-
 external/mit/mesa-demos/dist/src/glsl/geom-wide-lines.c           |    60 +-
 external/mit/mesa-demos/dist/src/gs/Makefile.in                   |    25 +-
 external/mit/mesa-demos/dist/src/objviewer/Makefile.in            |    25 +-
 external/mit/mesa-demos/dist/src/osdemos/Makefile.in              |    25 +-
 external/mit/mesa-demos/dist/src/perf/Makefile.am                 |     2 +
 external/mit/mesa-demos/dist/src/perf/Makefile.in                 |    51 +-
 external/mit/mesa-demos/dist/src/perf/glsl-compile-time.c         |   318 +
 external/mit/mesa-demos/dist/src/rbug/Makefile.in                 |    25 +-
 external/mit/mesa-demos/dist/src/redbook/Makefile.in              |    25 +-
 external/mit/mesa-demos/dist/src/samples/Makefile.in              |    25 +-
 external/mit/mesa-demos/dist/src/slang/Makefile.in                |    25 +-
 external/mit/mesa-demos/dist/src/tests/Makefile.am                |     2 +
 external/mit/mesa-demos/dist/src/tests/Makefile.in                |    86 +-
 external/mit/mesa-demos/dist/src/tests/arbfpspec.c                |    14 +-
 external/mit/mesa-demos/dist/src/tests/arbfptest1.c               |     8 +-
 external/mit/mesa-demos/dist/src/tests/arbvptest1.c               |     8 +-
 external/mit/mesa-demos/dist/src/tests/arbvptest3.c               |     8 +-
 external/mit/mesa-demos/dist/src/tests/arbvptorus.c               |     8 +-
 external/mit/mesa-demos/dist/src/tests/arbvpwarpmesh.c            |     8 +-
 external/mit/mesa-demos/dist/src/tests/calibrate_rast.c           |   233 +-
 external/mit/mesa-demos/dist/src/tests/drawstencil.c              |    14 +-
 external/mit/mesa-demos/dist/src/tests/front-back-modes.c         |   192 +
 external/mit/mesa-demos/dist/src/tests/line-sample.c              |   206 +
 external/mit/mesa-demos/dist/src/tests/rubberband.c               |    34 +-
 external/mit/mesa-demos/dist/src/tests/shader_api.c               |     1 +
 external/mit/mesa-demos/dist/src/tests/texdown.c                  |    24 +-
 external/mit/mesa-demos/dist/src/tests/tkmap.c                    |    29 -
 external/mit/mesa-demos/dist/src/tools/Makefile.in                |    24 +-
 external/mit/mesa-demos/dist/src/trivial/Makefile.am              |     1 +
 external/mit/mesa-demos/dist/src/trivial/Makefile.in              |    87 +-
 external/mit/mesa-demos/dist/src/trivial/draw2arrays.c            |     8 +-
 external/mit/mesa-demos/dist/src/trivial/drawarrays.c             |     8 +-
 external/mit/mesa-demos/dist/src/trivial/drawelements-large.c     |     8 +-
 external/mit/mesa-demos/dist/src/trivial/drawelements.c           |     8 +-
 external/mit/mesa-demos/dist/src/trivial/drawrange.c              |     8 +-
 external/mit/mesa-demos/dist/src/trivial/lineloop-elts.c          |     8 +-
 external/mit/mesa-demos/dist/src/trivial/quad-offset-unfilled.c   |     2 +-
 external/mit/mesa-demos/dist/src/trivial/tri-array-interleaved.c  |     8 +-
 external/mit/mesa-demos/dist/src/trivial/tri-fp-const-imm.c       |     8 +-
 external/mit/mesa-demos/dist/src/trivial/tri-fp.c                 |     8 +-
 external/mit/mesa-demos/dist/src/trivial/tri-tex-stipple.c        |   120 +
 external/mit/mesa-demos/dist/src/trivial/vbo-drawarrays-2101010.c |     6 +-
 external/mit/mesa-demos/dist/src/trivial/vbo-drawarrays.c         |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vbo-drawelements.c       |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vbo-drawrange.c          |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vbo-noninterleaved.c     |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vbo-tri.c                |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-array-hf.c            |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-array-int.c           |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-array.c               |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-clip.c                |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-line-clip.c           |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-cb-pos.c          |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-cb-tex.c          |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-cb.c              |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-imm.c             |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-invariant.c       |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-swap.c            |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri-tex.c             |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-tri.c                 |     8 +-
 external/mit/mesa-demos/dist/src/trivial/vp-unfilled.c            |     8 +-
 external/mit/mesa-demos/dist/src/util/Makefile.in                 |    25 +-
 external/mit/mesa-demos/dist/src/util/README                      |     1 -
 external/mit/mesa-demos/dist/src/util/shaderutil.c                |     1 +
 external/mit/mesa-demos/dist/src/util/trackball.c                 |     2 +-
 external/mit/mesa-demos/dist/src/vp/Makefile.in                   |    25 +-
 external/mit/mesa-demos/dist/src/vp/vp-tris.c                     |     8 +-
 external/mit/mesa-demos/dist/src/vpglsl/Makefile.in               |    25 +-
 external/mit/mesa-demos/dist/src/wgl/Makefile.in                  |    24 +-
 external/mit/mesa-demos/dist/src/wgl/sharedtex_mt.c               |    17 +-
 external/mit/mesa-demos/dist/src/wgl/wglinfo.c                    |   506 +-
 external/mit/mesa-demos/dist/src/wgl/wglthreads.c                 |    34 +-
 external/mit/mesa-demos/dist/src/xdemos/Makefile.am               |     6 -
 external/mit/mesa-demos/dist/src/xdemos/Makefile.in               |    69 +-
 external/mit/mesa-demos/dist/src/xdemos/glinfo_common.c           |   318 +-
 external/mit/mesa-demos/dist/src/xdemos/glinfo_common.h           |    56 +
 external/mit/mesa-demos/dist/src/xdemos/glxgears_pixmap.c         |     2 +-
 external/mit/mesa-demos/dist/src/xdemos/glxinfo.c                 |   234 +-
 external/mit/mesa-demos/dist/src/xdemos/sharedtex_mt.c            |     9 +-
 129 files changed, 10974 insertions(+), 6326 deletions(-)

diffs (truncated from 33548 to 300 lines):

diff -r 0b0941ccc703 -r 3bd4d3f2499b external/mit/mesa-demos/dist/Makefile.in
--- a/external/mit/mesa-demos/dist/Makefile.in  Mon Mar 11 06:44:01 2019 +0000
+++ b/external/mit/mesa-demos/dist/Makefile.in  Mon Mar 11 06:59:37 2019 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,17 @@
 # Authors:
 #    Eric Anholt <eric%anholt.net@localhost>
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -102,9 +112,6 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-       $(top_srcdir)/configure $(am__configure_deps) compile \
-       config.guess config.sub install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
        $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
@@ -112,6 +119,8 @@
        $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+       $(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -173,6 +182,8 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \
+       config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -281,6 +292,7 @@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MESA_GLAPI = @MESA_GLAPI@
@@ -363,6 +375,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -392,7 +405,6 @@
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
@@ -592,7 +604,7 @@
          ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
        || chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-       tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+       tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
        $(am__post_remove_distdir)
 dist-bzip2: distdir
        tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
@@ -607,17 +619,17 @@
        $(am__post_remove_distdir)
 
 dist-tarZ: distdir
-       @echo WARNING: "Support for shar distribution archives is" \
-                      "deprecated." >&2
+       @echo WARNING: "Support for distribution archives compressed with" \
+                      "legacy program 'compress' is deprecated." >&2
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__post_remove_distdir)
 
 dist-shar: distdir
-       @echo WARNING: "Support for distribution archives compressed with" \
-                      "legacy program 'compress' is deprecated." >&2
+       @echo WARNING: "Support for shar distribution archives is" \
+                      "deprecated." >&2
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-       shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+       shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
        $(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -635,7 +647,7 @@
 distcheck: dist
        case '$(DIST_ARCHIVES)' in \
        *.tar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+         eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
        *.tar.bz2*) \
          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
        *.tar.lz*) \
@@ -645,23 +657,23 @@
        *.tar.Z*) \
          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
        *.shar.gz*) \
-         GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+         eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
        *.zip*) \
          unzip $(distdir).zip ;;\
        esac
        chmod -R a-w $(distdir)
        chmod u+w $(distdir)
-       mkdir $(distdir)/_build $(distdir)/_inst
+       mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
        chmod a-w $(distdir)
        test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build \
-         && ../configure \
+         && $(am__cd) $(distdir)/_build/sub \
+         && ../../configure \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
-           --srcdir=.. --prefix="$$dc_install_base" \
+           --srcdir=../.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -837,6 +849,8 @@
        mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
        ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -r 0b0941ccc703 -r 3bd4d3f2499b external/mit/mesa-demos/dist/aclocal.m4
--- a/external/mit/mesa-demos/dist/aclocal.m4   Mon Mar 11 06:44:01 2019 +0000
+++ b/external/mit/mesa-demos/dist/aclocal.m4   Mon Mar 11 06:59:37 2019 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,32 +20,63 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott%netsplit.com@localhost>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
+dnl Copyright © 2004 Scott James Remnant <scott%netsplit.com@localhost>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists%gmail.com@localhost>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
 
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+    [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -67,18 +98,19 @@
                PKG_CONFIG=""
        fi
 fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
 
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
 AC_DEFUN([PKG_CHECK_EXISTS],
 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
 if test -n "$PKG_CONFIG" && \
@@ -88,8 +120,10 @@
   $3])dnl
 fi])
 
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])



Home | Main Index | Thread Index | Old Index