diff options
| author | Johannes Obermayr <[email protected]> | 2012-09-02 01:35:47 +0200 |
|---|---|---|
| committer | Adam Jackson <[email protected]> | 2012-09-07 14:44:48 -0400 |
| commit | 10a96f4a4d3d3166fa6907d4b302e01ece5ccd7e (patch) | |
| tree | b526a3328391dc3fbd7692cf40c8faf0e611b5d7 | |
| parent | 3433471e8b46dd9dd042a00f88ef9ad011a94aac (diff) | |
Set OSMESA_VERSION=8.
VERSION_NUMBER is not required anymore. So it will be removed.
Reviewed-by: Adam Jackson <[email protected]>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.pc.in | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index f7f1605a403..e2904b5d09c 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 db1d14fe80e..6d087f27653 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -35,7 +35,7 @@ lib_LTLIBRARIES = lib@[email protected] 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@[email protected] $(MKDIR_P) $(top_builddir)/$(LIB_DIR); ln -f .libs/lib@[email protected] $(top_builddir)/$(LIB_DIR)/lib@[email protected]; - ln -f .libs/lib@[email protected].@VERSION@ $(top_builddir)/$(LIB_DIR)/lib@[email protected].@VERSION@; + ln -f .libs/lib@[email protected].@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@[email protected].@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 307255ffc99..cd77fd7656f 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} |