diff options
Diffstat (limited to 'mesalib/configure')
| -rw-r--r-- | mesalib/configure | 139 |
1 files changed, 114 insertions, 25 deletions
diff --git a/mesalib/configure b/mesalib/configure index 6b33f88ac..25b438d15 100644 --- a/mesalib/configure +++ b/mesalib/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for Mesa 7.8.1. +# Generated by GNU Autoconf 2.65 for Mesa 7.8.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa>. # @@ -553,8 +553,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Mesa' PACKAGE_TARNAME='mesa' -PACKAGE_VERSION='7.8.1' -PACKAGE_STRING='Mesa 7.8.1' +PACKAGE_VERSION='7.8.2' +PACKAGE_STRING='Mesa 7.8.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa' PACKAGE_URL='' @@ -674,6 +674,8 @@ X_LIBS X_PRE_LIBS X_CFLAGS XMKMF +X11_LIBS +X11_CFLAGS GALLIUM_STATE_TRACKERS_DIRS GALLIUM_DRIVERS_DIRS GALLIUM_WINSYS_DRM_DIRS @@ -834,6 +836,8 @@ OPT_FLAGS ARCH_FLAGS MKLIB_OPTIONS PIC_FLAGS +X11_CFLAGS +X11_LIBS XMKMF XLIBGL_CFLAGS XLIBGL_LIBS @@ -1406,7 +1410,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Mesa 7.8.1 to adapt to many kinds of systems. +\`configure' configures Mesa 7.8.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1477,7 +1481,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Mesa 7.8.1:";; + short | recursive ) echo "Configuration of Mesa 7.8.2:";; esac cat <<\_ACEOF @@ -1500,7 +1504,7 @@ Optional Features: --enable-glx-tls enable TLS support in GLX [default=disabled] --disable-driglx-direct enable direct rendering in GLX for DRI [default=enabled] - --enable-gl-osmesa enable OSMesa on libGL [default=enabled for xlib + --enable-gl-osmesa enable OSMesa with libGL [default=enabled for xlib driver] --disable-egl disable EGL library [default=enabled] --disable-glu enable OpenGL Utility library [default=enabled] @@ -1572,6 +1576,8 @@ Some influential environment variables: MKLIB_OPTIONS Options for the Mesa library script, mklib PIC_FLAGS compiler flags for PIC code + X11_CFLAGS C compiler flags for X11, overriding pkg-config + X11_LIBS linker flags for X11, overriding pkg-config XMKMF Path to xmkmf, Makefile generator for X Window System XLIBGL_CFLAGS C compiler flags for XLIBGL, overriding pkg-config @@ -1688,7 +1694,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Mesa configure 7.8.1 +Mesa configure 7.8.2 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2097,7 +2103,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Mesa $as_me 7.8.1, which was +It was created by Mesa $as_me 7.8.2, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -5623,7 +5629,98 @@ $as_echo "$x11_pkgconfig" >&6; } else x11_pkgconfig=no fi -if test "$x11_pkgconfig" = no; then +if test "$x11_pkgconfig" = yes; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 +$as_echo_n "checking for X11... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$X11_CFLAGS"; then + pkg_cv_X11_CFLAGS="$X11_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$X11_LIBS"; then + pkg_cv_X11_LIBS="$X11_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5 + ($PKG_CONFIG --exists --print-errors "x11") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + X11_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11"` + else + X11_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11"` + fi + # Put the nasty error message in config.log where it belongs + echo "$X11_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (x11) were not met: + +$X11_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables X11_CFLAGS +and X11_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" "$LINENO" 5 +elif test $pkg_failed = untried; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "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. + +Alternatively, you may set the environment variables X11_CFLAGS +and X11_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details." "$LINENO" 5; } +else + X11_CFLAGS=$pkg_cv_X11_CFLAGS + X11_LIBS=$pkg_cv_X11_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + : +fi +else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 $as_echo_n "checking for X... " >&6; } @@ -6307,6 +6404,10 @@ fi fi + test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS" + test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11" + + fi @@ -7391,8 +7492,8 @@ x16|x32) esac -case "$mesa_driver" in -osmesa) +case "$DRIVER_DIRS" in +*osmesa*) # only link libraries with osmesa if shared if test "$enable_static" = no; then OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" @@ -7402,19 +7503,7 @@ osmesa) OSMESA_MESA_DEPS="" OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" ;; -*) - # Link OSMesa to libGL otherwise - OSMESA_LIB_DEPS="" - # only link libraries with osmesa if shared - if test "$enable_static" = no; then - OSMESA_MESA_DEPS='-l$(GL_LIB)' - else - OSMESA_MESA_DEPS="" - fi - OSMESA_PC_REQ="gl" - ;; esac -OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV" @@ -9071,7 +9160,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Mesa $as_me 7.8.1, which was +This file was extended by Mesa $as_me 7.8.2, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9128,7 +9217,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Mesa config.status 7.8.1 +Mesa config.status 7.8.2 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" |