Module: Mesa
Branch: master
Commit: 10a96f4a4d3d3166fa6907d4b302e01ece5ccd7e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=10a96f4a4d3d3166fa6907d4b302e01ece5ccd7e
Author: Johannes Obermayr <johannesoberm...@gmx.de>
Date: Sun Sep 2 01:35:47 2012 +0200
Set OSMESA_VERSION=8.
VERSION_NUMBER is not required anymore. So it will be removed.
Reviewed-by: Adam Jackson <a...@redhat.com>
---
configure.ac | 8 ++++----
src/mesa/drivers/osmesa/Makefile.am | 4 ++--
src/mesa/drivers/osmesa/osmesa.pc.in | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index f7f1605..e2904b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_PREREQ([2.2])
LT_INIT([disable-static])
+dnl Set internal versions
+OSMESA_VERSION=8
+AC_SUBST([OSMESA_VERSION])
+
dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.24
LIBDRM_RADEON_REQUIRED=2.4.39
@@ -1921,10 +1925,6 @@ 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 db1d14f..6d087f2 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 @VERSION_NUMBER@
-no-undefined
+lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@
-no-undefined
lib@OSMESA_LIB@_la_LIBADD = \
$(top_builddir)/src/mesa/libmesa.la \
$(top_builddir)/src/mapi/glapi/libglapi.la
@@ -46,7 +46,7 @@ if BUILD_SHARED
all-local: lib@OSMESA_LIB@.la
$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
ln -f .libs/lib@OSMESA_LIB@.so
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
- ln -f .libs/lib@OSMESA_LIB@.so.@VERSION@
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@VERSION@;
+ ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@
$(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
endif
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/mesa/drivers/osmesa/osmesa.pc.in
b/src/mesa/drivers/osmesa/osmesa.pc.in
index 307255f..cd77fd7 100644
--- a/src/mesa/drivers/osmesa/osmesa.pc.in
+++ b/src/mesa/drivers/osmesa/osmesa.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: osmesa
Description: Mesa Off-screen Rendering library
Requires: @OSMESA_PC_REQ@
-Version: @PACKAGE_VERSION@
+Version: @OSMESA_VERSION@
Libs: -L${libdir} -l@OSMESA_LIB@
Libs.private: @OSMESA_PC_LIB_PRIV@
Cflags: -I${includedir}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
