mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-09-06 18:05:39 +00:00
configure: link image libs with libshared
This fix xwayland.so that was complaining about jpeg symbols from the libshared. Note that xwayland is not using the jpeg ones, but now that symbols are read up front we need to link anyway.. or break apart that library. Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
This commit is contained in:
parent
76fc57e75c
commit
4f238a590d
12
configure.ac
12
configure.ac
|
@ -141,12 +141,6 @@ PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])
|
|||
AS_IF([test "x$have_webp" = "xyes"],
|
||||
[AC_DEFINE([HAVE_WEBP], [1], [Have webp])])
|
||||
|
||||
PKG_CHECK_MODULES(CAIRO, [cairo])
|
||||
SHARED_LIBS="$CAIRO_LIBS $PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS"
|
||||
SHARED_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
|
||||
AC_SUBST(SHARED_LIBS)
|
||||
AC_SUBST(SHARED_CFLAGS)
|
||||
|
||||
AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes)
|
||||
if test x$have_jpeglib = xyes; then
|
||||
IMAGE_LIBS="$IMAGE_LIBS -ljpeg"
|
||||
|
@ -154,6 +148,12 @@ else
|
|||
AC_ERROR([libjpeg not found])
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(CAIRO, [cairo])
|
||||
SHARED_LIBS="$CAIRO_LIBS $PIXMAN_LIBS $PNG_LIBS $WEBP_LIBS $IMAGE_LIBS"
|
||||
SHARED_CFLAGS="$CAIRO_CFLAGS $PIXMAN_CFLAGS $PNG_CFLAGS $WEBP_CFLAGS"
|
||||
AC_SUBST(SHARED_LIBS)
|
||||
AC_SUBST(SHARED_CFLAGS)
|
||||
|
||||
COMPOSITOR_LIBS="$COMPOSITOR_LIBS $IMAGE_LIBS"
|
||||
COMPOSITOR_CFLAGS="$COMPOSITOR_CFLAGS $IMAGE_CFLAGS"
|
||||
|
||||
|
|
Loading…
Reference in a new issue