diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2012-11-29 12:23:36 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-11-29 13:32:11 -0500 |
| commit | 6006ecb497379c511fcc7f165fea3393558f3570 (patch) | |
| tree | b14374611b197a9e4414a43f7ec7e084a3ab1794 /configure.ac | |
| parent | 0ea7333392c3afdbcd8f9194d51cee1e3f55178c (diff) | |
configure.ac: Don't link weston to cairo or image libraries
We were pulling in cairo and the image loading libraries through libshared.
Split out libshared into a core libshared and a libshared-cairo that
pulls in the extra libraries.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 7329c068..8cff8dcb 100644 --- a/configure.ac +++ b/configure.ac @@ -164,19 +164,13 @@ AS_IF([test "x$have_webp" = "xyes"], AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes) if test x$have_jpeglib = xyes; then - IMAGE_LIBS="$IMAGE_LIBS -ljpeg" + JPEG_LIBS="-ljpeg" else AC_ERROR([libjpeg not found]) fi +AC_SUBST(JPEG_LIBS) 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" AC_ARG_ENABLE(simple-clients, AS_HELP_STRING([--disable-simple-clients], @@ -205,9 +199,6 @@ if test x$enable_clients = xyes; then PKG_CHECK_MODULES(CLIENT, [wayland-client cairo >= 1.10.0 xkbcommon wayland-cursor]) PKG_CHECK_MODULES(WESTON_INFO, [wayland-client]) - CLIENT_CFLAGS="$CLIENT_CFLAGS $IMAGE_CFLAGS" - CLIENT_LIBS="$CLIENT_LIBS $IMAGE_LIBS" - PKG_CHECK_MODULES(POPPLER, [poppler-glib glib-2.0 gobject-2.0 gio-2.0 ], [have_poppler=yes], [have_poppler=no]) PKG_CHECK_MODULES(CAIRO_EGL, [wayland-egl egl >= 7.10 cairo-egl >= 1.11.3 $cairo_modules], |