diff options
| -rw-r--r-- | macros/ChangeLog | 13 | ||||
| -rw-r--r-- | macros/Makefile.am | 12 | ||||
| -rw-r--r-- | macros/aclocal-include.m4 | 6 | ||||
| -rw-r--r-- | macros/gnome-common.m4 | 14 |
4 files changed, 43 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index e2b373ce8d..017dbdd565 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,16 @@ +1999-02-04 Martin Baulig <martin@home-of-linux.org> + + * aclocal-include.m4 (INSIDE_GNOME_COMMON): New automake + conditional that's always false. + + * gnome-common.m4: New file. This defines a `GNOME_COMMON_INIT' + macro that should be used in all GNOME Applications outside + the CVS tree. + + * Makefile.am: If we are `INSIDE_GNOME_COMMON', install all + $(MACROS), autogen.sh, gnome-common.m4 and a newly created + gnome-macros.dep in `$(datadir)/aclocal/gnome'. + Sun Jan 24 03:59:32 1999 Timur Bakeyev <mc@bat.ru> * gnome-pthread-check.m4: Add recognition of 2 more libraries - diff --git a/macros/Makefile.am b/macros/Makefile.am index c354713040..2922a907ac 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -22,8 +22,18 @@ MACROS= \ linger.m4 \ need-declaration.m4 -EXTRA_DIST=$(MACROS) autogen.sh +EXTRA_DIST=$(MACROS) gnome-common.m4 autogen.sh MAINTAINERCLEANFILES=macros.dep @MAINT@macros.dep: Makefile.am @MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@ + +if INSIDE_GNOME_COMMON +gnome_aclocaldir = $(datadir)/aclocal/gnome + +gnome-macros.dep: Makefile.am + @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@ + +gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh + +endif diff --git a/macros/aclocal-include.m4 b/macros/aclocal-include.m4 index ba7bbfa06c..dba50e8d3d 100644 --- a/macros/aclocal-include.m4 +++ b/macros/aclocal-include.m4 @@ -7,4 +7,8 @@ dnl AM_ACLOCAL_INCLUDE(macrodir) AC_DEFUN([AM_ACLOCAL_INCLUDE], -[for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done]) +[ + AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) + + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done +]) diff --git a/macros/gnome-common.m4 b/macros/gnome-common.m4 new file mode 100644 index 0000000000..b72382970b --- /dev/null +++ b/macros/gnome-common.m4 @@ -0,0 +1,14 @@ +# gnome-common.m4 +# +# This only for packages that are not in the GNOME CVS tree. + +dnl GNOME_COMMON_INIT + +AC_DEFUN([GNOME_COMMON_INIT], +[ + GNOME_ACLOCAL_DIR=`$ACLOCAL --print-ac-dir`/gnome + AC_SUBST(GNOME_ACLOCAL_DIR) + + ACLOCAL="$ACLOCAL -I $GNOME_ACLOCAL_DIR" +]) + |