On Fri, Nov 27, 2015 at 04:37:35PM +0200, Jussi Kukkonen wrote: > This is useful for reproducable builds. > > Signed-off-by: Jussi Kukkonen <[email protected]>
LGTM, Reviewed-by: Bryce Harrington <[email protected]> > --- > > This was originally sent by Tim Orling on May 2014. I've moved the > AM_CONDITIONAL below the test as requested in Kristians review. > He also said AM_CONDITIONAL needs to key off have_lcms but I believe > that would break "--disable-lcms" when lcms2-dev is present so did > not include that change: I think this version works for all cases. > > Have a nice weekend everyone, > Jussi > > > configure.ac | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 23b0790..bba8050 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -577,12 +577,24 @@ AC_ARG_ENABLE(demo-clients-install, > enable_demo_clients_install=no) > AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = > "xyes"]) > > -PKG_CHECK_MODULES(LCMS, lcms2, > - [have_lcms=yes], [have_lcms=no]) > -if test "x$have_lcms" = xyes; then > - AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) > +AC_ARG_ENABLE(lcms, > + AS_HELP_STRING([--disable-lcms], > + [Disable lcms support]),, > + enable_lcms=auto) > +if test "x$enable_lcms" != "xno"; then > + PKG_CHECK_MODULES(LCMS, > + lcms2, > + have_lcms=yes, > + have_lcms=no) > + if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then > + AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't > be found]) > + fi > + if test "x$have_lcms" = "xyes"; then > + enable_lcms=yes > + AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) > + fi > fi > -AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) > +AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) > > AC_PATH_PROG([wayland_scanner], [wayland-scanner]) > if test x$wayland_scanner = x; then > -- > 2.6.2 > > _______________________________________________ > 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
