From 4f238a590d4a5711653b4bf956b135cbe847eef9 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Tue, 31 Jul 2012 15:47:48 +0300 Subject: [PATCH] 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 --- configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index a8fc7f2..4e44eb6 100644 --- a/configure.ac +++ b/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" -- 2.7.4