diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-08-22 11:43:05 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-08-24 11:08:19 -0700 |
| commit | a8fd8cb9e7840c508d20466ff6e7c04bdc09d3bf (patch) | |
| tree | a17be1a66a341e10d2b1111b475edd5262437307 | |
| parent | 383a70bf9aa68e4273cae764bcf0eea710ce2830 (diff) | |
build: Replace OSMESA_VERSION with generic VERSION_NUMBER
Can be used by other modules.
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c1a8932294f..46e95275550 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,13 +1196,10 @@ if test "x$enable_osmesa" = xyes; then OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" fi -OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'` - AC_SUBST([OSMESA_LIB_DEPS]) AC_SUBST([OSMESA_MESA_DEPS]) AC_SUBST([OSMESA_PC_REQ]) AC_SUBST([OSMESA_PC_LIB_PRIV]) -AC_SUBST([OSMESA_VERSION]) dnl dnl gbm configuration @@ -1982,6 +1979,10 @@ AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1) +# To pass as an argument to libtool's -version-number flag +VERSION_NUMBER=`echo "$VERSION" | $SED 's/\./:/g'` +AC_SUBST([VERSION_NUMBER]) + dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index adda0fd6de5..3e2f2dc80ca 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -35,7 +35,7 @@ lib_LTLIBRARIES = lib@OSMESA_LIB@.la lib@OSMESA_LIB@_la_SOURCES = osmesa.c -lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined +lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @VERSION_NUMBER@ -no-undefined lib@OSMESA_LIB@_la_LIBADD = \ $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.la |