summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2009-02-11 11:04:29 -0800
committerDan Nicholson <dbn.lists@gmail.com>2009-02-11 11:58:39 -0800
commitc5bae14245192e83e7a91a6b72dc8451dd76f8ef (patch)
treeaaf4c5907bf8f70d23d6fa665a4ce2a137e52fdc
parent61e925f354fabc90bb3b2ed49ad82eaf939533e2 (diff)
autoconf: Adjust to new asm SOURCES variables
Commit 90b2beb661f630966788a6e909dc759c99e38973 changed the assembly variables. Without this change, the glapi assembly wasn't being built when it was supposed to, resulting in missing symbols in libGL. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
-rw-r--r--configs/autoconf.in4
-rw-r--r--configure.ac18
2 files changed, 11 insertions, 11 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 41173481af8..b352974a4c5 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -22,8 +22,8 @@ LDFLAGS = @LDFLAGS@
EXTRA_LIB_PATH = @EXTRA_LIB_PATH@
# Assembler
-ASM_SOURCES = @ASM_SOURCES@
-ASM_API = @ASM_API@
+MESA_ASM_SOURCES = @MESA_ASM_SOURCES@
+GLAPI_ASM_SOURCES = @GLAPI_ASM_SOURCES@
# Misc tools and flags
MAKE = @MAKE@
diff --git a/configure.ac b/configure.ac
index a124f426033..be5bcad0f3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,8 +273,8 @@ AC_ARG_ENABLE([asm],
)
asm_arch=""
ASM_FLAGS=""
-ASM_SOURCES=""
-ASM_API=""
+MESA_ASM_SOURCES=""
+GLAPI_ASM_SOURCES=""
AC_MSG_CHECKING([whether to enable assembly])
test "x$enable_asm" = xno && AC_MSG_RESULT([no])
# disable if cross compiling on x86/x86_64 since we must run gen_matypes
@@ -315,19 +315,19 @@ if test "x$enable_asm" = xyes; then
case "$asm_arch" in
x86)
ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
- ASM_SOURCES='$(X86_SOURCES)'
- ASM_API='$(X86_API)'
+ MESA_ASM_SOURCES='$(X86_SOURCES)'
+ GLAPI_ASM_SOURCES='$(X86_API)'
AC_MSG_RESULT([yes, x86])
;;
x86_64)
ASM_FLAGS="-DUSE_X86_64_ASM"
- ASM_SOURCES='$(X86-64_SOURCES)'
- ASM_API='$(X86-64_API)'
+ MESA_ASM_SOURCES='$(X86-64_SOURCES)'
+ GLAPI_ASM_SOURCES='$(X86-64_API)'
AC_MSG_RESULT([yes, x86_64])
;;
ppc)
ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"
- ASM_SOURCES='$(PPC_SOURCES)'
+ MESA_ASM_SOURCES='$(PPC_SOURCES)'
AC_MSG_RESULT([yes, ppc])
;;
*)
@@ -336,8 +336,8 @@ if test "x$enable_asm" = xyes; then
esac
fi
AC_SUBST([ASM_FLAGS])
-AC_SUBST([ASM_SOURCES])
-AC_SUBST([ASM_API])
+AC_SUBST([MESA_ASM_SOURCES])
+AC_SUBST([GLAPI_ASM_SOURCES])
dnl PIC code macro
MESA_PIC_FLAGS