On Thursday 20 of September 2012 16:42:01 Nikola Pajkovsky wrote:
> Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
> ---
> configure.ac | 14 ++++++++++++--
> src/Makefile.am | 8 +++++++-
> 2 files changed, 19 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 27d9680..03e7104 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -121,9 +121,7 @@ PYTHON_LIBS=`python-config --libs 2> /dev/null`
> AC_SUBST(PYTHON_CFLAGS)
> AC_SUBST(PYTHON_LIBS)
>
> -PKG_CHECK_MODULES([GTK], [gtk+-3.0])
> PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21])
> -PKG_CHECK_MODULES([GIO], [gio-2.0])
> PKG_CHECK_MODULES([DBUS], [dbus-1])
> PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
> PKG_CHECK_MODULES([NSS], [nss])
> @@ -134,6 +132,18 @@ PKG_CHECK_MODULES([PROXY], [libproxy-1.0], [
> AC_DEFINE([HAVE_PROXY], [1], [Use libproxy])
> ], [:])
>
> +AC_ARG_WITH(wizard,
> +AS_HELP_STRING([--with-wizard],[use wizard (default is YES)]),
> +LIBREPORT_PARSE_WITH([wizard]))
The gtk-helpers directory mentioned below doesn't contain gui-wizard-gtk stuff only (I use libreport-gtk in the gnome-abrt project). I propose to use --with-gtk instead of --with-wizard.
> +if test -z "$NO_WIZARD"; then
> +AM_CONDITIONAL(BUILD_WIZARD, true)
> +PKG_CHECK_MODULES([GTK], [gtk+-3.0])
> +PKG_CHECK_MODULES([GIO], [gio-2.0])
> +else
> +AM_CONDITIONAL(BUILD_WIZARD, false)
> +fi dnl end NO_WIZARD
> +
> +
> AC_ARG_WITH(ureport,
> AS_HELP_STRING([--with-ureport],[use uReport plugin (default is YES)]),
> LIBREPORT_PARSE_WITH([ureport]))
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 3a6da3f..e77e5ae 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -1 +1,7 @@
> -SUBDIRS = include lib plugins report-python gtk-helpers gui-wizard-gtk cli
> report-newt client-python +sub_dirs =
> +
> +if BUILD_WIZARD
> +sub_dirs += gtk-helpers gui-wizard-gtk
> +endif
> +
> +SUBDIRS = include lib plugins report-python cli report-newt client-python
> $(sub_dirs)