diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 7db1830af4..672bab85c1 100644 --- a/configure.ac +++ b/configure.ac @@ -4,24 +4,13 @@ AC_PREREQ(2.59) dnl Versioning dnl Make version number available to autoconf and configure -m4_define(mesa_major, 7) -m4_define(mesa_minor, 1) -m4_define(mesa_tiny, 0) -m4_define(mesa_version, [mesa_major().mesa_minor().mesa_tiny()]) +m4_define([mesa_version],[7.1.0]) AC_INIT([Mesa],[mesa_version()], [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa]) AC_CONFIG_AUX_DIR(bin) AC_CANONICAL_HOST -dnl Substitute the version number into shell variables -MESA_MAJOR=mesa_major() -MESA_MINOR=mesa_minor() -MESA_TINY=mesa_tiny() -AC_SUBST(MESA_MAJOR) -AC_SUBST(MESA_MINOR) -AC_SUBST(MESA_TINY) - dnl Check for progs AC_PROG_CPP AC_PROG_CC @@ -47,9 +36,14 @@ AC_CHECK_FUNC([dlopen], [], dnl Make sure the pkg-config macros are defined m4_ifdef([PKG_PROG_PKG_CONFIG],,[ - AC_MSG_ERROR([The pkg-config autoconf macros are not defined. - Did you run 'make configure'?])] -) + m4_errprint([Error: Could not locate the pkg-config autoconf macros. + These are usually located in /usr/share/aclocal/pkg.m4. If your + macros are in a different location, try setting the environment + variable ACLOCAL="aclocal -I/other/macro/dir" before running + autoreconf. +]) + m4_exit([1]) +]) PKG_PROG_PKG_CONFIG() dnl LIB_DIR - library basename @@ -237,11 +231,26 @@ dnl dnl Driver configuration. Options are xlib, dri and osmesa right now. dnl More later: directfb, fbdev, ... dnl +default_driver="xlib" + +case "$host_os" in +linux*) + case "$host_cpu" in + i*86|x86_64|powerpc*) default_driver="dri";; + esac + ;; +freebsd* | dragonfly*) + case "$host_cpu" in + i*86|x86_64) default_driver="dri";; + esac + ;; +esac + AC_ARG_WITH(driver, [AS_HELP_STRING([--with-driver=DRIVER], - [driver for Mesa: xlib,dri,osmesa @<:@default=xlib@:>@])], + [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])], mesa_driver="$withval", - mesa_driver="xlib") + mesa_driver="$default_driver") dnl Check for valid option case "x$mesa_driver" in xxlib|xdri|xosmesa) @@ -372,6 +381,7 @@ xlib) GL_LIB_DEPS="$X_LIBS -lX11 -lXext" fi GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread" + GLCORE_LIB_DEPS="" # if static, move the external libraries to the programs # and empty the libraries for libGL @@ -403,13 +413,16 @@ dri) # need DRM libs, -lpthread, etc. GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" + GLCORE_LIB_DEPS="-lm -lpthread $DLOPEN_LIBS" ;; osmesa) # No libGL for osmesa GL_LIB_DEPS="" + GLCORE_LIB_DEPS="" ;; esac AC_SUBST(GL_LIB_DEPS) +AC_SUBST(GLCORE_LIB_DEPS) dnl dnl More X11 setup |