diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/mesa/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/osmesa/osmesa.pc.in (renamed from src/mesa/osmesa.pc.in) | 0 |
4 files changed, 4 insertions, 9 deletions
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@[email protected] -endif lib@OSMESA_LIB@_la_SOURCES = osmesa.c @@ -47,3 +45,6 @@ lib@OSMESA_LIB@_la_LIBADD = \ all-local: lib@[email protected] $(MKDIR_P) $(top_builddir)/$(LIB_DIR); ln -f .libs/lib@[email protected] $(top_builddir)/$(LIB_DIR)/lib@[email protected]; + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = osmesa.pc diff --git a/src/mesa/osmesa.pc.in b/src/mesa/drivers/osmesa/osmesa.pc.in index 307255ffc99..307255ffc99 100644 --- a/src/mesa/osmesa.pc.in +++ b/src/mesa/drivers/osmesa/osmesa.pc.in |