callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New automake conditional that's always false.

Browse Source 
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'.

svn path=/trunk/; revision=640
This commit is contained in:
Martin Baulig
1999-02-04 13:04:51 +00:00
committed by Martin Baulig
parent 9760a8f971
commit 23e6445f8b
4 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
macros/ChangeLog
View File

@ -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 -

12
macros/Makefile.am
View File

@ -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

6
macros/aclocal-include.m4
View File

@ -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
])

14
macros/gnome-common.m4 Normal file
View File

@ -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"
])