oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AM_CONDITIONAL() statements can't be conditionally executed (automake

Browse Source 
2002-03-12  James Henstridge  <james@daa.com.au>

	* acinclude.m4 (LIBGTOP_HEACKER_TESTS): AM_CONDITIONAL()
	statements can't be conditionally executed (automake compat fix).
	(GNOME_LIBGTOP_SYSDEPS): move the conditional here so that it is
	always executed.

2002-03-12  James Henstridge  <james@daa.com.au>

	* Makefile.am (MAKEINFO): using += seems to screw up the build
	with newer automakes.  Set it explicitly (using @MAKEINFO@) seems
	to be compatible with both.
This commit is contained in:
James Henstridge
2002-03-12 14:57:12 +00:00
committed by James Henstridge
parent 1c248d7e93
commit 4df359b9d3
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2002-03-12 James Henstridge <james@daa.com.au>
* acinclude.m4 (LIBGTOP_HEACKER_TESTS): AM_CONDITIONAL()
statements can't be conditionally executed (automake compat fix).
(GNOME_LIBGTOP_SYSDEPS): move the conditional here so that it is
always executed.
2002-02-10 Kevin Vandersloot <kfv101@psu.edu>
* configure.in: bump version

9
acinclude.m4
View File

@@ -598,11 +598,11 @@ dnl if true; defines conditional 'NEED_LIBGTOP'.
AC_DEFUN([LIBGTOP_HACKER_TESTS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(linux-table,
[ --with-linux-table Use the table () function from Martin Baulig],
[linux_table="$withval"],[linux_table=auto])
case "$host_os" in
linux*)
AC_ARG_WITH(linux-table,
[ --with-linux-table Use the table () function from Martin Baulig],[
linux_table="$withval"],[linux_table=auto])
if test $linux_table = yes ; then
AC_CHECK_HEADER(linux/table.h, linux_table=yes, linux_table=no)
elif test $linux_table = auto ; then
@@ -638,7 +638,6 @@ main (void)
if test $linux_table = yes ; then
AC_DEFINE(HAVE_LINUX_TABLE)
fi
AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
;;
esac
])
@@ -662,9 +661,11 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes)
linux_table=auto
if test x$hacker_mode = xyes ; then
LIBGTOP_HACKER_TESTS
fi
AM_CONDITIONAL(LINUX_TABLE, test $linux_table = yes)
AC_ARG_WITH(libgtop-smp,
[ --with-libgtop-smp Enable SMP support (default-auto)],[

6
doc/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-03-12 James Henstridge <james@daa.com.au>
* Makefile.am (MAKEINFO): using += seems to screw up the build
with newer automakes. Set it explicitly (using @MAKEINFO@) seems
to be compatible with both.
2001-11-26 Abel Cheung <maddog@linux.org.hk>
* libgtop.texi, Makefile.am: Renamed to libgtop2.texi

2
doc/Makefile.am
View File

@@ -4,7 +4,7 @@ libgtop2_TEXINFOS = libgtop2.texi about.texi reference.texi \
auto-macros.texi version.texi main.texi \
white-paper.texi
MAKEINFO += -I @libgtop_top_builddir@/doc
MAKEINFO = @MAKEINFO@ -I @libgtop_top_builddir@/doc
EXTRA_DIST = auto-macros.texi.in