From 27013e5164a1823d5bdcb5ca21ae4ca0df40b8f8 Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Thu, 26 Jul 2012 11:07:37 +0100 Subject: [PATCH] Move installing osmesa.pc to drivers/osmesa Move installing osmesa.pc to drivers/osmesa, where it belongs better This also restores the installation of gl.pc if we are building osmesa at the same time as libGL, which was broken in commit 39785488 when the .pc installation was converted to automake v2: Remove HAVE_OSMESA_DRIVER automake conditional, it's now pointless as we will only be building in the drivers/osmesa directory if the condition it checked was true. Signed-off-by: Jon TURNEY Reviewed-by: Eric Anholt --- configure.ac | 3 +-- src/mesa/Makefile.am | 5 ----- src/mesa/drivers/osmesa/Makefile.am | 5 +++-- src/mesa/{ => drivers/osmesa}/osmesa.pc.in | 0 4 files changed, 4 insertions(+), 9 deletions(-) rename src/mesa/{ => drivers/osmesa}/osmesa.pc.in (100%) diff --git a/configure.ac b/configure.ac index 47b91872018..b01b1921bd0 100644 --- a/configure.ac +++ b/configure.ac @@ -2118,7 +2118,6 @@ AC_SUBST([GALLIUM_MAKE_DIRS]) AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1) -AM_CONDITIONAL(HAVE_OSMESA_DRIVER, echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1) 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) @@ -2186,7 +2185,7 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/osmesa/Makefile src/mesa/drivers/x11/Makefile src/mesa/gl.pc - src/mesa/osmesa.pc]) + src/mesa/drivers/osmesa/osmesa.pc]) dnl Sort the dirs alphabetically GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "` diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am index 2ec57ea912b..bb70ed6ea36 100644 --- a/src/mesa/Makefile.am +++ b/src/mesa/Makefile.am @@ -140,12 +140,7 @@ all-local: libmesa.la libmesagallium.la CLEANFILES += libmesa.a libmesagallium.a pkgconfigdir = $(libdir)/pkgconfig - -if HAVE_OSMESA_DRIVER -pkgconfig_DATA = osmesa.pc -else pkgconfig_DATA = gl.pc -endif # Emacs tags tags: diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index 59ee62a7a66..dbee925dd79 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -31,9 +31,7 @@ AM_CFLAGS = \ $(DEFINES) \ $(API_DEFINES) -if HAVE_OSMESA_DRIVER lib_LTLIBRARIES = lib@OSMESA_LIB@.la -endif lib@OSMESA_LIB@_la_SOURCES = osmesa.c @@ -47,3 +45,6 @@ lib@OSMESA_LIB@_la_LIBADD = \ 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; + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = osmesa.pc diff --git a/src/mesa/osmesa.pc.in b/src/mesa/drivers/osmesa/osmesa.pc.in similarity index 100% rename from src/mesa/osmesa.pc.in rename to src/mesa/drivers/osmesa/osmesa.pc.in -- 2.30.2