From: Lyude Paul <lyude@redhat.com>
To: Paul Kocialkowski <paul.kocialkowski@linux.intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH i-g-t 3/3] configure.ac: Make gsl dependency and dependent code optional
Date: Wed, 19 Jul 2017 13:48:06 -0400 [thread overview]
Message-ID: <1500486486.3548.4.camel@redhat.com> (raw)
In-Reply-To: <20170719145900.2858-4-paul.kocialkowski@linux.intel.com>
R-B for the first two, I've already pushed them. For this one I'd
prefer it if you just squashed it into the series where you add analog
frame comparison support. Otherwise, looks good.
On Wed, 2017-07-19 at 17:59 +0300, Paul Kocialkowski wrote:
> This adds automake instructions, with matching autoconf macros, to
> make
> the dependency on gsl and the code that depends on it optional.
>
> This should allow preserving the ability to build IGT on Android,
> where
> gsl support may be lacking.
>
> Signed-off-by: Paul Kocialkowski <paul.kocialkowski@linux.intel.com>
> ---
> configure.ac | 6 +++++-
> lib/Makefile.am | 7 +++++++
> lib/Makefile.sources | 2 --
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 20e5cf96..de0e85dd 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -181,7 +181,8 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib=yes],
> [glib=no])
> if test x"$glib" = xyes; then
> AC_DEFINE(HAVE_GLIB,1,[Enable glib support])
> fi
> -PKG_CHECK_MODULES(GSL, gsl)
> +PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no])
> +AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes])
>
> # for chamelium
> AC_ARG_ENABLE(chamelium, AS_HELP_STRING([--disable-chamelium],
> @@ -196,6 +197,9 @@ if test "x$enable_chamelium" = xyes; then
> if test x"$glib" != xyes; then
> AC_MSG_ERROR([Failed to find glib, required by
> chamelium. Use --disable-chamelium to disable chamelium support.])
> fi
> + if test x"$gsl" != xyes; then
> + AC_MSG_ERROR([Failed to find gsl, required by
> chamelium. Use --disable-chamelium to disable chamelium support.])
> + fi
> AC_DEFINE(HAVE_CHAMELIUM, 1, [Enable Chamelium support])
> fi
>
> diff --git a/lib/Makefile.am b/lib/Makefile.am
> index fb922ced..9b506f69 100644
> --- a/lib/Makefile.am
> +++ b/lib/Makefile.am
> @@ -29,6 +29,13 @@ lib_source_list += \
> $(NULL)
> endif
>
> +if HAVE_GSL
> +lib_source_list += \
> + igt_frame.c \
> + igt_frame.h \
> + $(NULL)
> +endif
> +
> AM_CPPFLAGS = -I$(top_srcdir)
> AM_CFLAGS = \
> $(CWARNFLAGS) \
> diff --git a/lib/Makefile.sources b/lib/Makefile.sources
> index c2e58809..53fdb54c 100644
> --- a/lib/Makefile.sources
> +++ b/lib/Makefile.sources
> @@ -83,8 +83,6 @@ lib_source_list = \
> uwildmat/uwildmat.c \
> igt_kmod.c \
> igt_kmod.h \
> - igt_frame.c \
> - igt_frame.h \
> $(NULL)
>
> .PHONY: version.h.tmp
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2017-07-19 17:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 14:58 [PATCH i-g-t 0/3] Various autoconf fixups Paul Kocialkowski
2017-07-19 14:58 ` [PATCH i-g-t 1/3] configure.ac: Enable back chamelium build by default Paul Kocialkowski
2017-07-19 14:58 ` [PATCH i-g-t 2/3] configure.ac: Make glib dependency optional to preserve Android build Paul Kocialkowski
2017-07-19 14:59 ` [PATCH i-g-t 3/3] configure.ac: Make gsl dependency and dependent code optional Paul Kocialkowski
2017-07-19 17:48 ` Lyude Paul [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1500486486.3548.4.camel@redhat.com \
--to=lyude@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paul.kocialkowski@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).