[oprof-cvs] CVS: oprofile ChangeLog,1.675,1.676 Makefile.am,1.2,1.3 configure.in,1.118,1.119

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile
In directory usw-pr-cvs1:/tmp/cvs-serv26046

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
Some steps to get --enable-abi to work again



Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.675
retrieving revision 1.676
diff -u -d -r1.675 -r1.676
--- ChangeLog	10 Nov 2002 01:33:43 -0000	1.675
+++ ChangeLog	10 Nov 2002 02:00:50 -0000	1.676
@@ -1,5 +1,20 @@
 2002-11-10  John Levon  <le...@mo...>
 
+	* Makefile.am:
+	* configure.in:
+	* dae/Makefile.am:
+	* daemon/Makefile.am:
+	* utils/Makefile.am: s/WITH_KERNEL_SUPPORT/kernel_support
+
+	* configure.in:
+	* dae/Makefile.am:
+	* dae/oprofiled.c:
+	* daemon/Makefile.am:
+	* daemon/oprofiled.c:
+	* libabi/Makefile.am: approximate working --enable-abi more
+
+2002-11-10  John Levon  <le...@mo...>
+
 	* dae/oprofiled.c:
 	* daemon/oprofiled.c: abi tidy
  

Index: Makefile.am
===================================================================
RCS file: /cvsroot/oprofile/oprofile/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	10 Nov 2002 00:58:47 -0000	1.2
+++ Makefile.am	10 Nov 2002 02:00:50 -0000	1.3
@@ -4,7 +4,7 @@
 all-local: kernel_module
 install-exec-local: install.kernel
 
-if WITH_KERNEL_SUPPORT
+if kernel_support
 kernel_module:
 install.kernel:
 else

Index: configure.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/configure.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- configure.in	10 Nov 2002 00:58:47 -0000	1.118
+++ configure.in	10 Nov 2002 02:00:50 -0000	1.119
@@ -93,7 +93,7 @@
 fi
 AC_MSG_RESULT($OPROFILE_25)
 
-AM_CONDITIONAL(WITH_KERNEL_SUPPORT, test $OPROFILE_25 = yes)
+AM_CONDITIONAL(kernel_support, test $OPROFILE_25 = yes)
  
 if test "$OPROFILE_25" = "no"; then
 	if test ! -f $KINC/linux/autoconf.h; then
@@ -284,7 +284,10 @@
 AC_ARG_ENABLE(abi,
 	[  --enable-abi                 enable abi portability code (default is disabled)],
 	enable_abi=$enableval, enable_abi=no)
-AC_SUBST(enable_abi)
+if test "$enable_abi" = yes; then
+	AC_DEFINE(OPROF_ABI, 1, [whether to build ABI tools])
+fi
+AM_CONDITIONAL(enable_abi, test "$enable_abi" = yes)
 
 # try to find the docbook stylesheets
 if test -e /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/xhtml/docbook.xsl; then