diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-13 17:55:39 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-08-14 15:36:49 +0100 |
| commit | 957a28e63c8a205d01c48cb8fa03c3c1abe4b499 (patch) | |
| tree | c085e53aa6f61883d9851312b22b4b90eb32f0df | |
| parent | 2c50212b14da27de4e3da62488ae4e35c069d84e (diff) | |
Revert "configure: Fix --enable-XX-bit flags by moving LT_INIT where it should"
This reverts commit 2af28040d639dddbb7c258981a00eaf3dfcbcf03.
The commit was resolving an issue where libtool will not setup the
environment correctly when one explicitly provides --enable-{32,64}-bit
at configure time. It was caused due to the "-m32,64" C{,XX}FLAGS being
set too late relative to LT_INIT.
At the same time this cases the enable_static to be incorrectly set,
amongst others leading to build issues. Rather than being smart and
trying to handle 32/64 bit build ourselves it may be better to delegate
it to the builder/maintainer. The latter should now know better which is
the correct(most appropriate) method.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82536
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=82546
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 4ff87ebaa9d..f678fa37880 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,9 @@ AC_CHECK_PROGS([PYTHON2], [python2 python]) AC_PROG_SED AC_PROG_MKDIR_P +LT_PREREQ([2.2]) +LT_INIT([disable-static]) + AX_PROG_BISON([], AS_IF([test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"], [AC_MSG_ERROR([bison not found - unable to compile glcpp-parse.y])])) @@ -2190,14 +2193,6 @@ dnl Add user CFLAGS and CXXFLAGS CFLAGS="$CFLAGS $USER_CFLAGS" CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" -dnl -dnl LT_INIT adds tests to determine host based on some variables like (AM_)C(XX)FLAGS and (AM_)LDFLAGS. -dnl They need to be set before calling LT_INIT so the macro can configure things correctly when cross_compiling. -dnl This will allow --enable-xx-bit to work as expected. -dnl -LT_PREREQ([2.2]) -LT_INIT([disable-static]) - dnl Substitute the config AC_CONFIG_FILES([Makefile src/Makefile |