build: Replace OSMESA_VERSION with generic VERSION_NUMBER
Can be used by other modules.
This commit is contained in:
parent
383a70bf9a
commit
a8fd8cb9e7
|
@ -1196,13 +1196,10 @@ if test "x$enable_osmesa" = xyes; then
|
||||||
OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
|
OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'`
|
|
||||||
|
|
||||||
AC_SUBST([OSMESA_LIB_DEPS])
|
AC_SUBST([OSMESA_LIB_DEPS])
|
||||||
AC_SUBST([OSMESA_MESA_DEPS])
|
AC_SUBST([OSMESA_MESA_DEPS])
|
||||||
AC_SUBST([OSMESA_PC_REQ])
|
AC_SUBST([OSMESA_PC_REQ])
|
||||||
AC_SUBST([OSMESA_PC_LIB_PRIV])
|
AC_SUBST([OSMESA_PC_LIB_PRIV])
|
||||||
AC_SUBST([OSMESA_VERSION])
|
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl gbm configuration
|
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_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)
|
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
|
dnl prepend CORE_DIRS to SRC_DIRS
|
||||||
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
|
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ lib_LTLIBRARIES = lib@OSMESA_LIB@.la
|
||||||
|
|
||||||
lib@OSMESA_LIB@_la_SOURCES = osmesa.c
|
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 = \
|
lib@OSMESA_LIB@_la_LIBADD = \
|
||||||
$(top_builddir)/src/mesa/libmesa.la \
|
$(top_builddir)/src/mesa/libmesa.la \
|
||||||
$(top_builddir)/src/mapi/glapi/libglapi.la
|
$(top_builddir)/src/mapi/glapi/libglapi.la
|
||||||
|
|
Loading…
Reference in New Issue