diff options
| author | Dan Nicholson <[email protected]> | 2009-02-11 15:16:00 -0800 |
|---|---|---|
| committer | Dan Nicholson <[email protected]> | 2009-02-11 15:16:00 -0800 |
| commit | 8217f24f21a0ea9888a18ec7399d2d974a43d1cb (patch) | |
| tree | 52389886805da004d420c73c92df044421b52b53 /configure.ac | |
| parent | 6b06a6b929aa742f92653728254255f1867d6210 (diff) | |
autoconf: Fix lib globbing for static builds
Reported-by: Siddhartha Chaudhuri <[email protected]>
Signed-off-by: Dan Nicholson <[email protected]>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index be5bcad0f3d..a9a8d5ad0be 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]) |