mirror of
https://github.com/cazfi/meta-games.git
synced 2026-01-29 17:08:42 +01:00
etr: Drop obsolete patches
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
@@ -1,49 +0,0 @@
|
||||
From 4cd511613675220a3fdb98d58bfb558d7eacc754 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 14 Mar 2015 00:48:57 +0100
|
||||
Subject: [PATCH] find libgl and libglu by pkg-config
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstrema-Status: pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
configure.ac | 16 ++++++++++------
|
||||
1 file changed, 10 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7dd6817..8af8a59 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -63,16 +63,20 @@ PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer],
|
||||
],
|
||||
[AC_MSG_ERROR([SDL_mixer not found])])
|
||||
|
||||
-AC_CHECK_LIB([GL], [glBegin], [],
|
||||
+PKG_CHECK_MODULES([GL], [gl],
|
||||
+[
|
||||
+ CFLAGS="${CFLAGS} $GL_CFLAGS"
|
||||
+ LIBS="${LIBS} $GL_LIBS"
|
||||
+],
|
||||
[AC_MSG_ERROR([libGL not found])])
|
||||
|
||||
-LIBS="$LIBS -lGL"
|
||||
-
|
||||
-AC_CHECK_LIB([GLU], [gluBeginCurve], [],
|
||||
+PKG_CHECK_MODULES([GLU], [glu],
|
||||
+[
|
||||
+ CFLAGS="${CFLAGS} $GLU_CFLAGS"
|
||||
+ LIBS="${LIBS} $GLU_LIBS"
|
||||
+],
|
||||
[AC_MSG_ERROR([libGLU not found])])
|
||||
|
||||
-LIBS="$LIBS -lGLU"
|
||||
-
|
||||
CPPFLAGS="${CPPFLAGS} -DETR_DATA_DIR=\\\"$datadir\\\""
|
||||
|
||||
# Request c++11 compatibility
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,235 +0,0 @@
|
||||
From 33b8facc7fc52270426ab93769509c854c8aa2be Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 14 Mar 2015 01:17:00 +0100
|
||||
Subject: [PATCH] find sdl by pkg-config
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
aclocal.m4 | 184 -----------------------------------------------------------
|
||||
configure.ac | 9 ++-
|
||||
2 files changed, 6 insertions(+), 187 deletions(-)
|
||||
|
||||
diff --git a/aclocal.m4 b/aclocal.m4
|
||||
index 45a8a0d..2499f7b 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -375,191 +375,7 @@ else
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
|
||||
-# Configure paths for SDL
|
||||
-# Sam Lantinga 9/21/99
|
||||
-# stolen from Manish Singh
|
||||
-# stolen back from Frank Belew
|
||||
-# stolen from Manish Singh
|
||||
-# Shamelessly stolen from Owen Taylor
|
||||
|
||||
-# serial 1
|
||||
-
|
||||
-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
|
||||
-dnl
|
||||
-AC_DEFUN([AM_PATH_SDL],
|
||||
-[dnl
|
||||
-dnl Get the cflags and libraries from the sdl-config script
|
||||
-dnl
|
||||
-AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
|
||||
- sdl_prefix="$withval", sdl_prefix="")
|
||||
-AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
|
||||
- sdl_exec_prefix="$withval", sdl_exec_prefix="")
|
||||
-AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
|
||||
- , enable_sdltest=yes)
|
||||
-
|
||||
- if test x$sdl_exec_prefix != x ; then
|
||||
- sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
|
||||
- if test x${SDL_CONFIG+set} != xset ; then
|
||||
- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
|
||||
- fi
|
||||
- fi
|
||||
- if test x$sdl_prefix != x ; then
|
||||
- sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
|
||||
- if test x${SDL_CONFIG+set} != xset ; then
|
||||
- SDL_CONFIG=$sdl_prefix/bin/sdl-config
|
||||
- fi
|
||||
- fi
|
||||
-
|
||||
- as_save_PATH="$PATH"
|
||||
- if test "x$prefix" != xNONE; then
|
||||
- PATH="$prefix/bin:$prefix/usr/bin:$PATH"
|
||||
- fi
|
||||
- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
|
||||
- PATH="$as_save_PATH"
|
||||
- min_sdl_version=ifelse([$1], ,0.11.0,$1)
|
||||
- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
|
||||
- no_sdl=""
|
||||
- if test "$SDL_CONFIG" = "no" ; then
|
||||
- no_sdl=yes
|
||||
- else
|
||||
- SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
|
||||
- SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
|
||||
-
|
||||
- sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
- sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
|
||||
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
- if test "x$enable_sdltest" = "xyes" ; then
|
||||
- ac_save_CFLAGS="$CFLAGS"
|
||||
- ac_save_CXXFLAGS="$CXXFLAGS"
|
||||
- ac_save_LIBS="$LIBS"
|
||||
- CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
||||
- LIBS="$LIBS $SDL_LIBS"
|
||||
-dnl
|
||||
-dnl Now check if the installed SDL is sufficiently new. (Also sanity
|
||||
-dnl checks the results of sdl-config to some extent
|
||||
-dnl
|
||||
- rm -f conf.sdltest
|
||||
- AC_TRY_RUN([
|
||||
-#include <stdio.h>
|
||||
-#include <stdlib.h>
|
||||
-#include <string.h>
|
||||
-#include "SDL.h"
|
||||
-
|
||||
-char*
|
||||
-my_strdup (char *str)
|
||||
-{
|
||||
- char *new_str;
|
||||
-
|
||||
- if (str)
|
||||
- {
|
||||
- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
|
||||
- strcpy (new_str, str);
|
||||
- }
|
||||
- else
|
||||
- new_str = NULL;
|
||||
-
|
||||
- return new_str;
|
||||
-}
|
||||
-
|
||||
-int main (int argc, char *argv[])
|
||||
-{
|
||||
- int major, minor, micro;
|
||||
- char *tmp_version;
|
||||
-
|
||||
- /* This hangs on some systems (?)
|
||||
- system ("touch conf.sdltest");
|
||||
- */
|
||||
- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
|
||||
-
|
||||
- /* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
- tmp_version = my_strdup("$min_sdl_version");
|
||||
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
- printf("%s, bad version string\n", "$min_sdl_version");
|
||||
- exit(1);
|
||||
- }
|
||||
-
|
||||
- if (($sdl_major_version > major) ||
|
||||
- (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
|
||||
- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
|
||||
- {
|
||||
- return 0;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
|
||||
- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
|
||||
- printf("*** best to upgrade to the required version.\n");
|
||||
- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
|
||||
- printf("*** to point to the correct copy of sdl-config, and remove the file\n");
|
||||
- printf("*** config.cache before re-running configure\n");
|
||||
- return 1;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
- CFLAGS="$ac_save_CFLAGS"
|
||||
- CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
- LIBS="$ac_save_LIBS"
|
||||
- fi
|
||||
- fi
|
||||
- if test "x$no_sdl" = x ; then
|
||||
- AC_MSG_RESULT(yes)
|
||||
- ifelse([$2], , :, [$2])
|
||||
- else
|
||||
- AC_MSG_RESULT(no)
|
||||
- if test "$SDL_CONFIG" = "no" ; then
|
||||
- echo "*** The sdl-config script installed by SDL could not be found"
|
||||
- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
- echo "*** your path, or set the SDL_CONFIG environment variable to the"
|
||||
- echo "*** full path to sdl-config."
|
||||
- else
|
||||
- if test -f conf.sdltest ; then
|
||||
- :
|
||||
- else
|
||||
- echo "*** Could not run SDL test program, checking why..."
|
||||
- CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
||||
- LIBS="$LIBS $SDL_LIBS"
|
||||
- AC_TRY_LINK([
|
||||
-#include <stdio.h>
|
||||
-#include "SDL.h"
|
||||
-
|
||||
-int main(int argc, char *argv[])
|
||||
-{ return 0; }
|
||||
-#undef main
|
||||
-#define main K_and_R_C_main
|
||||
-], [ return 0; ],
|
||||
- [ echo "*** The test program compiled, but did not run. This usually means"
|
||||
- echo "*** that the run-time linker is not finding SDL or finding the wrong"
|
||||
- echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
|
||||
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
- echo "*** is required on your system"
|
||||
- echo "***"
|
||||
- echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
- echo "*** exact error that occured. This usually means SDL was incorrectly installed"
|
||||
- echo "*** or that you have moved SDL since it was installed. In the latter case, you"
|
||||
- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
|
||||
- CFLAGS="$ac_save_CFLAGS"
|
||||
- CXXFLAGS="$ac_save_CXXFLAGS"
|
||||
- LIBS="$ac_save_LIBS"
|
||||
- fi
|
||||
- fi
|
||||
- SDL_CFLAGS=""
|
||||
- SDL_LIBS=""
|
||||
- ifelse([$3], , :, [$3])
|
||||
- fi
|
||||
- AC_SUBST(SDL_CFLAGS)
|
||||
- AC_SUBST(SDL_LIBS)
|
||||
- rm -f conf.sdltest
|
||||
-])
|
||||
|
||||
# Copyright (C) 2002-2013 Free Software Foundation, Inc.
|
||||
#
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8af8a59..576818a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -38,9 +38,12 @@ esac
|
||||
AC_FUNC_MALLOC
|
||||
AC_CHECK_FUNCS([floor getcwd memmove memset mkdir pow sqrt strchr strdup])
|
||||
|
||||
-AM_PATH_SDL([1.0.0])
|
||||
-CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
-LIBS="$LIBS $SDL_LIBS"
|
||||
+PKG_CHECK_MODULES([SDL], [sdl],
|
||||
+[
|
||||
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
|
||||
+ LIBS="$LIBS $SDL_LIBS"
|
||||
+],
|
||||
+[AC_MSG_ERROR([libsdl not found])])
|
||||
|
||||
PKG_CHECK_MODULES([FT2], [freetype2],
|
||||
[
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
diff -Nurd etr-0.6.0/configure.ac etr-0.6.0-newbie/configure.ac
|
||||
--- etr-0.6.0/configure.ac 2013-09-13 22:39:29.000000000 +0300
|
||||
+++ etr-0.6.0-newbie/configure.ac 2014-08-29 08:13:30.094868910 +0300
|
||||
@@ -15,10 +15,6 @@
|
||||
AC_PROG_CC
|
||||
|
||||
# Checks for libraries.
|
||||
-AC_CHECK_FT2
|
||||
-
|
||||
-CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
|
||||
-LIBS="$LIBS $FT2_LIBS"
|
||||
|
||||
# Checks for header files.
|
||||
AC_CHECK_HEADERS([float.h limits.h stdlib.h string.h sys/time.h unistd.h])
|
||||
@@ -46,6 +42,13 @@
|
||||
CFLAGS="$CFLAGS $SDL_CFLAGS"
|
||||
LIBS="$LIBS $SDL_LIBS"
|
||||
|
||||
+PKG_CHECK_MODULES([FT2], [freetype2],
|
||||
+[
|
||||
+ CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
|
||||
+ LIBS="$LIBS $FT2_LIBS"
|
||||
+],
|
||||
+[AC_MSG_ERROR([Freetype not found])])
|
||||
+
|
||||
PKG_CHECK_MODULES([SDLIMAGE], [SDL_image],
|
||||
[
|
||||
CFLAGS="${CFLAGS} $SDLIMAGE_CFLAGS"
|
||||
@@ -1,199 +0,0 @@
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 1 (pkg-config-0.24)
|
||||
#
|
||||
# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
#
|
||||
# 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.
|
||||
|
||||
# PKG_PROG_PKG_CONFIG([MIN-VERSION])
|
||||
# ----------------------------------
|
||||
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)))?$])
|
||||
m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
|
||||
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
|
||||
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
|
||||
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
|
||||
|
||||
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
|
||||
])# 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
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_EXISTS],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
|
||||
m4_default([$2], [:])
|
||||
m4_ifvaln([$3], [else
|
||||
$3])dnl
|
||||
fi])
|
||||
|
||||
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
|
||||
# ---------------------------------------------
|
||||
m4_define([_PKG_CONFIG],
|
||||
[if test -n "$$1"; then
|
||||
pkg_cv_[]$1="$$1"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
PKG_CHECK_EXISTS([$3],
|
||||
[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes ],
|
||||
[pkg_failed=yes])
|
||||
else
|
||||
pkg_failed=untried
|
||||
fi[]dnl
|
||||
])# _PKG_CONFIG
|
||||
|
||||
# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
# -----------------------------
|
||||
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
_pkg_short_errors_supported=yes
|
||||
else
|
||||
_pkg_short_errors_supported=no
|
||||
fi[]dnl
|
||||
])# _PKG_SHORT_ERRORS_SUPPORTED
|
||||
|
||||
|
||||
# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
|
||||
# [ACTION-IF-NOT-FOUND])
|
||||
#
|
||||
#
|
||||
# Note that if there is a possibility the first call to
|
||||
# PKG_CHECK_MODULES might not happen, you should be sure to include an
|
||||
# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
|
||||
#
|
||||
#
|
||||
# --------------------------------------------------------------
|
||||
AC_DEFUN([PKG_CHECK_MODULES],
|
||||
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
|
||||
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
||||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
||||
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
|
||||
and $1[]_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
|
||||
|
||||
m4_default([$4], [AC_MSG_ERROR(
|
||||
[Package requirements ($2) were not met:
|
||||
|
||||
$$1_PKG_ERRORS
|
||||
|
||||
Consider adjusting the PKG_CONFIG_PATH environment variable if you
|
||||
installed software in a non-standard prefix.
|
||||
|
||||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
path to pkg-config.
|
||||
|
||||
_PKG_TEXT
|
||||
|
||||
To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
|
||||
])
|
||||
else
|
||||
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
|
||||
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
|
||||
AC_MSG_RESULT([yes])
|
||||
$3
|
||||
fi[]dnl
|
||||
])# PKG_CHECK_MODULES
|
||||
|
||||
|
||||
# PKG_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable pkgconfigdir as the location where a module
|
||||
# should install pkg-config .pc files. By default the directory is
|
||||
# $libdir/pkgconfig, but the default can be changed by passing
|
||||
# DIRECTORY. The user can override through the --with-pkgconfigdir
|
||||
# parameter.
|
||||
AC_DEFUN([PKG_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
[pkg-config installation directory @<:@]pkg_default[@:>@])
|
||||
AC_ARG_WITH([pkgconfigdir],
|
||||
[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
|
||||
[with_pkgconfigdir=]pkg_default)
|
||||
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_INSTALLDIR
|
||||
|
||||
|
||||
# PKG_NOARCH_INSTALLDIR(DIRECTORY)
|
||||
# -------------------------
|
||||
# Substitutes the variable noarch_pkgconfigdir as the location where a
|
||||
# module should install arch-independent pkg-config .pc files. By
|
||||
# default the directory is $datadir/pkgconfig, but the default can be
|
||||
# changed by passing DIRECTORY. The user can override through the
|
||||
# --with-noarch-pkgconfigdir parameter.
|
||||
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
|
||||
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
|
||||
m4_pushdef([pkg_description],
|
||||
[pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
|
||||
AC_ARG_WITH([noarch-pkgconfigdir],
|
||||
[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
|
||||
[with_noarch_pkgconfigdir=]pkg_default)
|
||||
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
|
||||
m4_popdef([pkg_default])
|
||||
m4_popdef([pkg_description])
|
||||
]) dnl PKG_NOARCH_INSTALLDIR
|
||||
Reference in New Issue
Block a user