← Back to branch summary

~ubuntu-branches/debian/sid/cheese/sid

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Package Import Robot
  • Author(s): Laurent Bigonville
  • Date: 2014-10-19 20:42:33 UTC
  • mfrom: (1.6.9)
  • Revision ID: package-import@ubuntu.com-20141019204233-crj6dccep3y7mxd8
Tags: 3.14.1-1
* New upstream release.
  - Drop debian/patches/using-fmod-link-libm.patch: Applied upstream
* Drop debian/patches/revert-appstream-usage.patch and build-depend against
  appstream-util
* debian/control.in: Bump Standards-Version to 3.9.6 (no further changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
360
360
# serial 3
361
361
# 
362
362
 
363
 
dnl GNOME_COMMON_INIT
364
 
 
365
 
AU_DEFUN([GNOME_COMMON_INIT],
366
 
[
367
 
  dnl this macro should come after AC_CONFIG_MACRO_DIR
368
 
  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
369
 
 
370
 
  dnl ensure that when the Automake generated makefile calls aclocal,
371
 
  dnl it honours the $ACLOCAL_FLAGS environment variable
372
 
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
373
 
  if test -n "$ac_macro_dir"; then
374
 
    ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
375
 
  fi
376
 
 
377
 
  AC_SUBST([ACLOCAL_AMFLAGS])
378
 
],
379
 
[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
380
 
in your top-level Makefile.am, instead, where "m4" is the macro directory set
381
 
with AC_CONFIG_MACRO_DIR() in your configure.ac]])
382
 
 
383
363
AU_DEFUN([GNOME_DEBUG_CHECK],
384
364
[
385
365
        AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG])
791
771
EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f))))
792
772
 
793
773
distdir: distdir-help-files
794
 
distdir-help-files:
 
774
distdir-help-files: $(_HELP_LC_FILES)
795
775
        @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \
796
776
          $(MKDIR_P) "$(distdir)/$$lc"; \
797
777
          for file in $(HELP_FILES); do \
820
800
 
821
801
.PHONY: install-help
822
802
install-data-am: $(if $(HELP_ID),install-help)
823
 
install-help:
 
803
install-help: $(_HELP_LC_FILES)
824
804
        @for lc in C $(_HELP_LINGUAS); do \
825
805
          $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \
826
806
        done