Fixed bug #522
authorSam Lantinga <slouken@libsdl.org>
Sun, 04 Oct 2009 18:09:12 +0000
changeset 425d39ef8d550b6
parent 424 2cd7840dc8c4
child 426 5d37755905f9
Fixed bug #522

Mike Frysinger 2007-12-10 16:47:36 PST

it's much easier to manage .pc files for cross-compiling setups than it is for
random *-config scripts ... the cross-compiled pkg-config files can all be
easily/tightly controlled and separate from the host pkg-config files. the
*-config files however are to be found in $PATH and can easily pick the wrong
one.

can we get the sdl.m4 macro updated so that it checks for libsdl.pc first via
the standard PKG_CHECK_MODULES() m4 macro, and if that fails, fall back to the
normal sdl-config voodoo.
acinclude/pkg.m4
acinclude/sdl.m4
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/acinclude/pkg.m4	Sun Oct 04 18:09:12 2009 +0000
     1.3 @@ -0,0 +1,157 @@
     1.4 +# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
     1.5 +# 
     1.6 +# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
     1.7 +#
     1.8 +# This program is free software; you can redistribute it and/or modify
     1.9 +# it under the terms of the GNU General Public License as published by
    1.10 +# the Free Software Foundation; either version 2 of the License, or
    1.11 +# (at your option) any later version.
    1.12 +#
    1.13 +# This program is distributed in the hope that it will be useful, but
    1.14 +# WITHOUT ANY WARRANTY; without even the implied warranty of
    1.15 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    1.16 +# General Public License for more details.
    1.17 +#
    1.18 +# You should have received a copy of the GNU General Public License
    1.19 +# along with this program; if not, write to the Free Software
    1.20 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
    1.21 +#
    1.22 +# As a special exception to the GNU General Public License, if you
    1.23 +# distribute this file as part of a program that contains a
    1.24 +# configuration script generated by Autoconf, you may include it under
    1.25 +# the same distribution terms that you use for the rest of that program.
    1.26 +
    1.27 +# PKG_PROG_PKG_CONFIG([MIN-VERSION])
    1.28 +# ----------------------------------
    1.29 +AC_DEFUN([PKG_PROG_PKG_CONFIG],
    1.30 +[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
    1.31 +m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
    1.32 +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
    1.33 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
    1.34 +	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
    1.35 +fi
    1.36 +if test -n "$PKG_CONFIG"; then
    1.37 +	_pkg_min_version=m4_default([$1], [0.9.0])
    1.38 +	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
    1.39 +	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
    1.40 +		AC_MSG_RESULT([yes])
    1.41 +	else
    1.42 +		AC_MSG_RESULT([no])
    1.43 +		PKG_CONFIG=""
    1.44 +	fi
    1.45 +		
    1.46 +fi[]dnl
    1.47 +])# PKG_PROG_PKG_CONFIG
    1.48 +
    1.49 +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
    1.50 +#
    1.51 +# Check to see whether a particular set of modules exists.  Similar
    1.52 +# to PKG_CHECK_MODULES(), but does not set variables or print errors.
    1.53 +#
    1.54 +#
    1.55 +# Similar to PKG_CHECK_MODULES, make sure that the first instance of
    1.56 +# this or PKG_CHECK_MODULES is called, or make sure to call
    1.57 +# PKG_CHECK_EXISTS manually
    1.58 +# --------------------------------------------------------------
    1.59 +AC_DEFUN([PKG_CHECK_EXISTS],
    1.60 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
    1.61 +if test -n "$PKG_CONFIG" && \
    1.62 +    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
    1.63 +  m4_ifval([$2], [$2], [:])
    1.64 +m4_ifvaln([$3], [else
    1.65 +  $3])dnl
    1.66 +fi])
    1.67 +
    1.68 +
    1.69 +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
    1.70 +# ---------------------------------------------
    1.71 +m4_define([_PKG_CONFIG],
    1.72 +[if test -n "$PKG_CONFIG"; then
    1.73 +    if test -n "$$1"; then
    1.74 +        pkg_cv_[]$1="$$1"
    1.75 +    else
    1.76 +        PKG_CHECK_EXISTS([$3],
    1.77 +                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
    1.78 +			 [pkg_failed=yes])
    1.79 +    fi
    1.80 +else
    1.81 +	pkg_failed=untried
    1.82 +fi[]dnl
    1.83 +])# _PKG_CONFIG
    1.84 +
    1.85 +# _PKG_SHORT_ERRORS_SUPPORTED
    1.86 +# -----------------------------
    1.87 +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
    1.88 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
    1.89 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
    1.90 +        _pkg_short_errors_supported=yes
    1.91 +else
    1.92 +        _pkg_short_errors_supported=no
    1.93 +fi[]dnl
    1.94 +])# _PKG_SHORT_ERRORS_SUPPORTED
    1.95 +
    1.96 +
    1.97 +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
    1.98 +# [ACTION-IF-NOT-FOUND])
    1.99 +#
   1.100 +#
   1.101 +# Note that if there is a possibility the first call to
   1.102 +# PKG_CHECK_MODULES might not happen, you should be sure to include an
   1.103 +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
   1.104 +#
   1.105 +#
   1.106 +# --------------------------------------------------------------
   1.107 +AC_DEFUN([PKG_CHECK_MODULES],
   1.108 +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
   1.109 +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
   1.110 +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
   1.111 +
   1.112 +pkg_failed=no
   1.113 +AC_MSG_CHECKING([for $1])
   1.114 +
   1.115 +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
   1.116 +_PKG_CONFIG([$1][_LIBS], [libs], [$2])
   1.117 +
   1.118 +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
   1.119 +and $1[]_LIBS to avoid the need to call pkg-config.
   1.120 +See the pkg-config man page for more details.])
   1.121 +
   1.122 +if test $pkg_failed = yes; then
   1.123 +        _PKG_SHORT_ERRORS_SUPPORTED
   1.124 +        if test $_pkg_short_errors_supported = yes; then
   1.125 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
   1.126 +        else 
   1.127 +	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
   1.128 +        fi
   1.129 +	# Put the nasty error message in config.log where it belongs
   1.130 +	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
   1.131 +
   1.132 +	ifelse([$4], , [AC_MSG_ERROR(dnl
   1.133 +[Package requirements ($2) were not met:
   1.134 +
   1.135 +$$1_PKG_ERRORS
   1.136 +
   1.137 +Consider adjusting the PKG_CONFIG_PATH environment variable if you
   1.138 +installed software in a non-standard prefix.
   1.139 +
   1.140 +_PKG_TEXT
   1.141 +])],
   1.142 +		[AC_MSG_RESULT([no])
   1.143 +                $4])
   1.144 +elif test $pkg_failed = untried; then
   1.145 +	ifelse([$4], , [AC_MSG_FAILURE(dnl
   1.146 +[The pkg-config script could not be found or is too old.  Make sure it
   1.147 +is in your PATH or set the PKG_CONFIG environment variable to the full
   1.148 +path to pkg-config.
   1.149 +
   1.150 +_PKG_TEXT
   1.151 +
   1.152 +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
   1.153 +		[$4])
   1.154 +else
   1.155 +	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
   1.156 +	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
   1.157 +        AC_MSG_RESULT([yes])
   1.158 +	ifelse([$3], , :, [$3])
   1.159 +fi[]dnl
   1.160 +])# PKG_CHECK_MODULES
     2.1 --- a/acinclude/sdl.m4	Sun Oct 04 04:34:30 2009 +0000
     2.2 +++ b/acinclude/sdl.m4	Sun Oct 04 18:09:12 2009 +0000
     2.3 @@ -19,45 +19,62 @@
     2.4  AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
     2.5  		    , enable_sdltest=yes)
     2.6  
     2.7 -  if test x$sdl_exec_prefix != x ; then
     2.8 -    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
     2.9 -    if test x${SDL_CONFIG+set} != xset ; then
    2.10 -      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    2.11 +  min_sdl_version=ifelse([$1], ,1.2.0,$1)
    2.12 +
    2.13 +  if test "x$sdl_prefix$sdl_exec_prefix" = x ; then
    2.14 +    PKG_CHECK_MODULES(SDL, [sdl >= $min_sdl_version],
    2.15 +           [sdl_pc=yes],
    2.16 +           [dnl
    2.17 +             AC_MSG_RESULT(no)
    2.18 +             sdl_pc=no
    2.19 +           ])
    2.20 +  else
    2.21 +    sdl_pc=no
    2.22 +    if test x$sdl_exec_prefix != x ; then
    2.23 +      sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
    2.24 +      if test x${SDL_CONFIG+set} != xset ; then
    2.25 +        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
    2.26 +      fi
    2.27      fi
    2.28 -  fi
    2.29 -  if test x$sdl_prefix != x ; then
    2.30 -    sdl_args="$sdl_args --prefix=$sdl_prefix"
    2.31 -    if test x${SDL_CONFIG+set} != xset ; then
    2.32 -      SDL_CONFIG=$sdl_prefix/bin/sdl-config
    2.33 +    if test x$sdl_prefix != x ; then
    2.34 +      sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
    2.35 +      if test x${SDL_CONFIG+set} != xset ; then
    2.36 +        SDL_CONFIG=$sdl_prefix/bin/sdl-config
    2.37 +      fi
    2.38      fi
    2.39    fi
    2.40  
    2.41 -  if test "x$prefix" != xNONE; then
    2.42 -    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    2.43 -  fi
    2.44 -  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
    2.45 -  min_sdl_version=ifelse([$1], ,0.11.0,$1)
    2.46 -  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
    2.47 -  no_sdl=""
    2.48 -  if test "$SDL_CONFIG" = "no" ; then
    2.49 -    no_sdl=yes
    2.50 +  if test "x$sdl_pc" = xyes ; then
    2.51 +    no_sdl=""
    2.52    else
    2.53 -    SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
    2.54 -    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
    2.55 +    as_save_PATH="$PATH"
    2.56 +    if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
    2.57 +      PATH="$prefix/bin:$prefix/usr/bin:$PATH"
    2.58 +    fi
    2.59 +    AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
    2.60 +    PATH="$as_save_PATH"
    2.61 +    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
    2.62 +    no_sdl=""
    2.63  
    2.64 -    sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
    2.65 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    2.66 -    sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
    2.67 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    2.68 -    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.69 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    2.70 -    if test "x$enable_sdltest" = "xyes" ; then
    2.71 -      ac_save_CFLAGS="$CFLAGS"
    2.72 -      ac_save_CXXFLAGS="$CXXFLAGS"
    2.73 -      ac_save_LIBS="$LIBS"
    2.74 -      CFLAGS="$CFLAGS $SDL_CFLAGS"
    2.75 -      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    2.76 -      LIBS="$LIBS $SDL_LIBS"
    2.77 +    if test "$SDL_CONFIG" = "no" ; then
    2.78 +      no_sdl=yes
    2.79 +    else
    2.80 +      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
    2.81 +      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
    2.82 +
    2.83 +      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.84 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
    2.85 +      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.86 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
    2.87 +      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
    2.88 +             sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
    2.89 +      if test "x$enable_sdltest" = "xyes" ; then
    2.90 +        ac_save_CFLAGS="$CFLAGS"
    2.91 +        ac_save_CXXFLAGS="$CXXFLAGS"
    2.92 +        ac_save_LIBS="$LIBS"
    2.93 +        CFLAGS="$CFLAGS $SDL_CFLAGS"
    2.94 +        CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
    2.95 +        LIBS="$LIBS $SDL_LIBS"
    2.96  dnl
    2.97  dnl Now check if the installed SDL is sufficiently new. (Also sanity
    2.98  dnl checks the results of sdl-config to some extent
    2.99 @@ -121,16 +138,20 @@
   2.100  }
   2.101  
   2.102  ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
   2.103 -       CFLAGS="$ac_save_CFLAGS"
   2.104 -       CXXFLAGS="$ac_save_CXXFLAGS"
   2.105 -       LIBS="$ac_save_LIBS"
   2.106 -     fi
   2.107 +        CFLAGS="$ac_save_CFLAGS"
   2.108 +        CXXFLAGS="$ac_save_CXXFLAGS"
   2.109 +        LIBS="$ac_save_LIBS"
   2.110 +      fi
   2.111 +    fi
   2.112 +    if test "x$no_sdl" = x ; then
   2.113 +      AC_MSG_RESULT(yes)
   2.114 +    else
   2.115 +      AC_MSG_RESULT(no)
   2.116 +    fi
   2.117    fi
   2.118    if test "x$no_sdl" = x ; then
   2.119 -     AC_MSG_RESULT(yes)
   2.120 -     ifelse([$2], , :, [$2])     
   2.121 +     ifelse([$2], , :, [$2])
   2.122    else
   2.123 -     AC_MSG_RESULT(no)
   2.124       if test "$SDL_CONFIG" = "no" ; then
   2.125         echo "*** The sdl-config script installed by SDL could not be found"
   2.126         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"