Mesa (master): autoconf: Fix lib globbing for static builds

[Dan Nicholson]

Module: Mesa
Branch: master
Commit: 8217f24f21a0ea9888a18ec7399d2d974a43d1cb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8217f24f21a0ea9888a18ec7399d2d974a43d1cb

Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Wed Feb 11 15:16:00 2009 -0800

autoconf: Fix lib globbing for static builds

Reported-by: Siddhartha Chaudhuri <expiring_frog at yahoo.co.uk>
Signed-off-by: Dan Nicholson <dbn.lists at gmail.com>

---

 configure.ac |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index be5bcad..a9a8d5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,11 +225,7 @@ dnl
 dnl library names
 dnl
 if test "$enable_static" = yes; then
-    GL_LIB_NAME='lib$(GL_LIB).a'
-    GLU_LIB_NAME='lib$(GLU_LIB).a'
-    GLUT_LIB_NAME='lib$(GLUT_LIB).a'
-    GLW_LIB_NAME='lib$(GLW_LIB).a'
-    OSMESA_LIB_NAME='lib$(OSMESA_LIB).a'
+    LIB_EXTENSION='a'
 else
     case "$host_os" in
     darwin* )
@@ -237,19 +233,20 @@ else
     * )
         LIB_EXTENSION='so' ;;
     esac
-
-    GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}
-    GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}
-    GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
-    GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
-    OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
-
-    GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
-    GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
-    GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
-    GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
-    OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
 fi
+
+GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}
+GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}
+GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
+GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
+OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
+
+GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
+GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
+GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
+GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
+OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
+
 AC_SUBST([GL_LIB_NAME])
 AC_SUBST([GLU_LIB_NAME])
 AC_SUBST([GLUT_LIB_NAME])