summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiddhartha Chaudhuri <expiring_frog@yahoo.co.uk>2009-02-09 07:58:38 -0700
committerBrian Paul <brianp@vmware.com>2009-02-09 07:59:32 -0700
commit1a46c8a062aea59de5cf55881104489db5d609e5 (patch)
treed632b740487c7fd808dcfe82bbd712ced1b73dc1
parent49002698193784dacffcbf993de26fcdd42c523e (diff)
downloadexternal_mesa3d-1a46c8a062aea59de5cf55881104489db5d609e5.zip
external_mesa3d-1a46c8a062aea59de5cf55881104489db5d609e5.tar.gz
external_mesa3d-1a46c8a062aea59de5cf55881104489db5d609e5.tar.bz2
mesa: autoconf fixes for OS X
See bug report 17566.
-rw-r--r--configs/autoconf.in7
-rw-r--r--configure.ac29
2 files changed, 31 insertions, 5 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in
index 4a89716..fb1287a 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -50,6 +50,13 @@ GLUT_LIB_NAME = @GLUT_LIB_NAME@
GLW_LIB_NAME = @GLW_LIB_NAME@
OSMESA_LIB_NAME = @OSMESA_LIB_NAME@
+# Globs used to install the lib and all symlinks
+GL_LIB_GLOB = @GL_LIB_GLOB@
+GLU_LIB_GLOB = @GLU_LIB_GLOB@
+GLUT_LIB_GLOB = @GLUT_LIB_GLOB@
+GLW_LIB_GLOB = @GLW_LIB_GLOB@
+OSMESA_LIB_GLOB = @OSMESA_LIB_GLOB@
+
# Directories to build
LIB_DIR = @LIB_DIR@
SRC_DIRS = @SRC_DIRS@
diff --git a/configure.ac b/configure.ac
index ba48e9d..a916af2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,11 +231,24 @@ if test "$enable_static" = yes; then
GLW_LIB_NAME='lib$(GLW_LIB).a'
OSMESA_LIB_NAME='lib$(OSMESA_LIB).a'
else
- GL_LIB_NAME='lib$(GL_LIB).so'
- GLU_LIB_NAME='lib$(GLU_LIB).so'
- GLUT_LIB_NAME='lib$(GLUT_LIB).so'
- GLW_LIB_NAME='lib$(GLW_LIB).so'
- OSMESA_LIB_NAME='lib$(OSMESA_LIB).so'
+ case "$host_os" in
+ darwin* )
+ LIB_EXTENSION='dylib' ;;
+ * )
+ 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
AC_SUBST([GL_LIB_NAME])
AC_SUBST([GLU_LIB_NAME])
@@ -243,6 +256,12 @@ AC_SUBST([GLUT_LIB_NAME])
AC_SUBST([GLW_LIB_NAME])
AC_SUBST([OSMESA_LIB_NAME])
+AC_SUBST([GL_LIB_GLOB])
+AC_SUBST([GLU_LIB_GLOB])
+AC_SUBST([GLUT_LIB_GLOB])
+AC_SUBST([GLW_LIB_GLOB])
+AC_SUBST([OSMESA_LIB_GLOB])
+
dnl
dnl Arch/platform-specific settings
dnl