On Tue, Jul 31, 2012 at 03:47:48PM +0300, Tiago Vignatti wrote: > 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.
Right, this is good for now. Kristian > Signed-off-by: Tiago Vignatti <[email protected]> > --- > 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" > > -- > 1.7.9.5 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
