[ABRT PATCH 1/2] be able to configure without bodhi

Jakub Filak jfilak at redhat.com
Wed May 29 07:36:34 UTC 2013


Pushed. Thank you!


On Thursday 02 of May 2013 12:17:57 Michal Toman wrote:
> Signed-off-by: Michal Toman <mtoman at redhat.com>
> ---
>  configure.ac            | 29 +++++++++++++++++++++++++++++
>  doc/Makefile.am         |  4 +++-
>  src/plugins/Makefile.am |  9 +++++++--
>  3 files changed, 39 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 1c93170..29b6884 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1,3 +1,20 @@
> +# copy-pasted from libreport
> +# ABRT_PARSE_WITH(PACKAGE)
> +# -----------------------
> +# For use in AC_ARG_WITH action-if-found, for packages default ON.
> +# * Set NO_PACKAGE=YesPlease for --without-PACKAGE
> +# * Unset NO_PACKAGE for --with-PACKAGE without ARG
> +AC_DEFUN([ABRT_PARSE_WITH],
> +    [m4_pushdef([ABRT_UC_PACKAGE], m4_toupper([$1]))dnl
> +    if test "$withval" = "no"; then
> +        NO_[]ABRT_UC_PACKAGE=YesPlease
> +    elif test "$withval" = "yes"; then
> +        NO_[]ABRT_UC_PACKAGE=
> +    else
> +        NO_[]ABRT_UC_PACKAGE=
> +    fi
> +    m4_popdef([ABRT_UC_PACKAGE])])
> +
>  AC_INIT([abrt],
>  	m4_esyscmd([cat ./abrt-version]),
>  	[crash-catcher at fedorahosted.org])
> @@ -173,6 +190,18 @@ AC_SUBST(EVENTS_DIR)
>  AC_SUBST(DEFAULT_DUMP_LOCATION)
>  AC_SUBST(DEFAULT_DUMP_DIR_MODE)
> 
> +AC_ARG_WITH(bodhi,
> +AS_HELP_STRING([--with-bodhi],[use Bodhi plugin (default is YES)]),
> +ABRT_PARSE_WITH([bodhi]))
> +
> +if test -z "$NO_BODHI"
> +then
> +PKG_CHECK_MODULES([JSON_C], [json])
> +AM_CONDITIONAL(BUILD_BODHI, true)
> +else
> +AM_CONDITIONAL(BUILD_BODHI, false)
> +fi dnl end NO_BODHI
> +
>  # Initialize the test suite.
>  AC_CONFIG_TESTDIR(tests)
>  AC_CONFIG_FILES([tests/Makefile tests/atlocal])
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index ea3b47e..94d8f8f 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -18,8 +18,10 @@ MAN1_TXT += abrt-cli.txt
>  MAN1_TXT += abrt-action-save-package-data.txt
>  MAN1_TXT += abrt-install-ccpp-hook.txt
>  MAN1_TXT += abrt-action-analyze-vmcore.txt
> -MAN1_TXT += abrt-bodhi.txt
>  MAN1_TXT += abrt-action-analyze-ccpp-local.txt
> +if BUILD_BODHI
> +MAN1_TXT += abrt-bodhi.txt
> +endif
> 
>  MAN5_TXT =
>  MAN5_TXT += abrt.conf.txt
> diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
> index d2723a7..767c045 100644
> --- a/src/plugins/Makefile.am
> +++ b/src/plugins/Makefile.am
> @@ -22,8 +22,12 @@ bin_PROGRAMS = \
>      abrt-action-generate-core-backtrace \
>      abrt-action-analyze-backtrace \
>      abrt-retrace-client \
> -    abrt-dedup-client \
> +    abrt-dedup-client
> +
> +if BUILD_BODHI
> +bin_PROGRAMS += \
>      abrt-bodhi
> +endif
> 
>  libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache
> 
> @@ -277,6 +281,7 @@ abrt_dedup_client_SOURCES = \
>       $(SATYR_LIBS) \
>       $(NSS_LIBS)
> 
> +if BUILD_BODHI
>  abrt_bodhi_SOURCES = \
>      bodhi.c
>   abrt_bodhi_CPPFLAGS = \
> @@ -293,7 +298,7 @@ abrt_bodhi_SOURCES = \
>      $(RPM_LIBS) \
>      $(LIBREPORT_LIBS) \
>      $(LIBREPORT_WEB_LIBS)
> -
> +endif
> 
>  DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@


More information about the Crash-catcher mailing list