diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-01-05 14:26:01 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-01-05 14:26:01 +0800 |
| commit | e5fdb5644d4505cddefaf02566bd35b947436c52 (patch) | |
| tree | f7276db8edf1086a42cae03cbf214757f10aca46 /configure.ac | |
| parent | bed6c3076227c97814b4ba21073c41a399fa9d8e (diff) | |
Fixed a configure bug.
Should check the enable-glamor-gles2 before use the variable.
And should include the config.h as the GLAMOR_GLES2 macro is
defined there.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 836fa76..04a3591 100644 --- a/configure.ac +++ b/configure.ac @@ -38,6 +38,8 @@ AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL +LT_PREREQ([2.2]) +LT_INIT([disable-static]) # Initialize X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -45,7 +47,6 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS - # Checks for programs. # AC_PROG_LN_S @@ -77,6 +78,10 @@ AC_SUBST([moduledir]) sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` AC_SUBST([sdkdir]) +AC_MSG_CHECKING([whether to include GLAMOR_GLES2 support]) +AC_ARG_ENABLE(glamor-gles2, AS_HELP_STRING([--enable-glamor-gles2], [Build glamor based on gles2 (default: no)]), [GLAMOR_GLES2="$enableval"], [GLAMOR_GLES2=no]) +AC_MSG_RESULT([$GLAMOR_GLES2]) + AM_CONDITIONAL([GLAMOR_GLES2], [test "x$GLAMOR_GLES2" = xyes]) if test "x$GLAMOR_GLES2" = xyes; then @@ -101,9 +106,6 @@ if test "x$EGL = xyes"; then PKG_CHECK_MODULES(GBM, $LIBGBM) fi - -AC_ARG_ENABLE(glamor-gles2, AS_HELP_STRING([--enable-glamor-gles2], [Build glamor based on gles2 (default: no)]), [GLAMOR_GLES2=$enableval], [GLAMOR_GLES2=no]) - AC_OUTPUT([Makefile glamor-egl.pc glamor.pc |