diff options
| author | Javier Jardón <jjardon@gnome.org> | 2014-10-30 13:53:12 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2014-10-30 13:58:23 +0000 |
| commit | d7aac07ae72a407f5a96ca265d7049933654ad70 (patch) | |
| tree | ec955f210bacccb3c054ec03a1142a00883bddd1 | |
| parent | 5983932b0b61ddc126fb5329abf8a91d8e874edf (diff) | |
| download | weston-baserock/jjardon/weston-1.6.0.tar.gz | |
Use AC_SEARCH_LIBS instead of AC_CHECK_LIBS for dl, jpeg, pambaserock/jjardon/weston-1.6.0
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 23 |
2 files changed, 9 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index 9bca9568..280e2dcf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,7 @@ weston_LDFLAGS = -export-dynamic weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON weston_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_LDADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ - $(DLOPEN_LIBS) libshared.la + libshared.la weston_SOURCES = \ src/git-version.h \ @@ -128,10 +128,9 @@ weston_launch_SOURCES = src/weston-launch.c src/weston-launch.h weston_launch_CPPFLAGS = -DBINDIR='"$(bindir)"' weston_launch_CFLAGS= \ $(GCC_CFLAGS) \ - $(PAM_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(LIBDRM_CFLAGS) -weston_launch_LDADD = $(PAM_LIBS) $(SYSTEMD_LOGIN_LIBS) $(LIBDRM_LIBS) +weston_launch_LDADD = $(SYSTEMD_LOGIN_LIBS) $(LIBDRM_LIBS) if ENABLE_SETUID_INSTALL install-exec-hook: @@ -803,8 +802,7 @@ libshared_cairo_la_LIBADD = \ $(PIXMAN_LIBS) \ $(CAIRO_LIBS) \ $(PNG_LIBS) \ - $(WEBP_LIBS) \ - $(JPEG_LIBS) + $(WEBP_LIBS) libshared_cairo_la_SOURCES = \ $(libshared_la_SOURCES) \ diff --git a/configure.ac b/configure.ac index aa6bd73b..20446418 100644 --- a/configure.ac +++ b/configure.ac @@ -42,9 +42,8 @@ AC_ARG_VAR([WESTON_SHELL_CLIENT], PKG_PROG_PKG_CONFIG() -AC_CHECK_FUNC([dlopen], [], - AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -AC_SUBST(DLOPEN_LIBS) +AC_SEARCH_LIBS([dlopen], [dl], [], + [AC_MSG_FAILURE([Dynamic linking loader missing])]) AC_SEARCH_LIBS([sqrt], [m], [], [AC_MSG_FAILURE([Math library missing])]) @@ -309,14 +308,8 @@ if test x$enable_vaapi_recorder != xno; then fi AM_CONDITIONAL(ENABLE_VAAPI_RECORDER, test "x$have_libva" = xyes) - -AC_CHECK_LIB([jpeg], [jpeg_CreateDecompress], have_jpeglib=yes) -if test x$have_jpeglib = xyes; then - JPEG_LIBS="-ljpeg" -else - AC_ERROR([libjpeg not found]) -fi -AC_SUBST(JPEG_LIBS) +AC_SEARCH_LIBS([jpeg_CreateDecompress], [jpeg], [], + [AC_MSG_FAILURE([libjpeg not found])]) PKG_CHECK_MODULES(CAIRO, [cairo]) @@ -383,12 +376,8 @@ AS_IF([test "x$have_systemd_login_209" = "xyes"], AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes) if test x$enable_weston_launch == xyes; then - AC_CHECK_LIB([pam], [pam_open_session], [have_pam=yes], [have_pam=no]) - if test x$have_pam == xno; then - AC_ERROR([weston-launch requires pam]) - fi - PAM_LIBS=-lpam - AC_SUBST(PAM_LIBS) + AC_SEARCH_LIBS([pam_open_session], [pam], [], + [AC_MSG_FAILURE([weston-launch requires pam])]) fi if test x$enable_egl = xyes; then |