[oprof-cvs] CVS: oprofile ChangeLog,1.612,1.613 configure.in,1.106,1.107

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

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

Modified Files:
	ChangeLog configure.in 
Log Message:
Some more 2.5 patch tweaks



Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -d -r1.612 -r1.613
--- ChangeLog	26 Sep 2002 20:28:51 -0000	1.612
+++ ChangeLog	26 Sep 2002 23:59:29 -0000	1.613
@@ -1,3 +1,14 @@
+2002-09-27  John Levon  <le...@mo...>
+
+	* configure.in: add --with-kernel-support for 2.5
+ 
+	* daemon/oprofiled.c: fix comment, give exit message on sig
+
+	* utils/Makefile.in:
+	* utils/op_stop_25: add 2.5 op_stop, no 2.5 op_dump
+
+	* utils/op_start_25: use enable
+ 
 2002-09-25  Bob Montgomery  <bo...@fc...>
 
 	* module/oprofile.c: avoid to dump zero samples count, fix #615087

Index: configure.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/configure.in,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- configure.in	25 Sep 2002 14:46:46 -0000	1.106
+++ configure.in	26 Sep 2002 23:59:29 -0000	1.107
@@ -73,42 +73,50 @@
 AC_CHECK_PROG(LD,ld,ld,)
 test "$LD" || AC_ERROR(ld not found)
 
-dnl  --- Find the Linux kernel, at least the headers ---
- 
-AC_SUBST(KSRC)
-KSRC=/lib/modules/`uname -r`/build
-AC_ARG_WITH(linux, [  --with-linux=dir             Path to Linux source tree], KSRC=$withval) 
-KINC=$KSRC/include
-AC_SUBST(KINC)
- 
-if test ! -f $KINC/linux/autoconf.h; then
-  AC_MSG_ERROR(no suitably configured kernel include tree found)
+AC_ARG_WITH(kernel-support, [  --with-kernel-support          Select if using CONFIG_OPROFILE],
+if test "$withval" = "yes"; then
+	OPROFILE_25=yes
 fi
+) 
 
-dnl  --- Get Linux kernel version and compile parameters ---
-
-AC_SUBST(KVERS)
-AC_MSG_CHECKING(for kernel version)
-dnl it's like this to handle mandrake's fubar version.h - bug #471448
-eval KVERS=`gcc -I$KINC -E -dM $KINC/linux/version.h | grep -w UTS_RELEASE | awk '{print $3}'`
-AC_MSG_RESULT($KVERS)
-case "$KVERS" in
-2.2.*|2.4.*|2.5.*) ;;
-*) AC_MSG_ERROR(Unsupported kernel version)
-esac
+if test "$OPROFILE_25" != "yes"; then
+	AC_MSG_CHECKING(for kernel OProfile support)
+	AX_COMPILE_OPTION(CONFIG_OPROFILE, OPROFILE_25=yes, OPROFILE_25=no)
+	AX_COMPILE_OPTION(CONFIG_OPROFILE_MODULE, OPROFILE_25=yes, OPROFILE_25=$OPROFILE_25)
+	AC_MSG_RESULT($OPROFILE_25)
+fi
+AC_SUBST(OPROFILE_25)
+ 
+if test "$OPROFILE_25" = "no"; then
+ 
+	dnl  --- Find the Linux kernel, at least the headers ---
+ 
+	AC_SUBST(KSRC)
+	KSRC=/lib/modules/`uname -r`/build
+	AC_ARG_WITH(linux, [  --with-linux=dir             Path to Linux source tree], KSRC=$withval) 
+	KINC=$KSRC/include
+	AC_SUBST(KINC)
+	 
+	if test ! -f $KINC/linux/autoconf.h; then
+	  AC_MSG_ERROR(no suitably configured kernel include tree found)
+	fi
 
-dnl Check for the minimal kernel version supported
-AC_MSG_CHECKING(kernel version)
-AX_KERNEL_VERSION(2, 2, 10, <=, AC_MSG_RESULT("ok"), AC_MSG_ERROR("check html documentation install section"))
+	dnl  --- Get Linux kernel version and compile parameters ---
 
+	AC_SUBST(KVERS)
+	AC_MSG_CHECKING(for kernel version)
+	dnl it's like this to handle mandrake's fubar version.h - bug #471448
+	eval KVERS=`gcc -I$KINC -E -dM $KINC/linux/version.h | grep -w UTS_RELEASE | awk '{print $3}'`
+	AC_MSG_RESULT($KVERS)
+	case "$KVERS" in
+	2.2.*|2.4.*|2.5.*) ;;
+	*) AC_MSG_ERROR(Unsupported kernel version)
+	esac
 
-AC_MSG_CHECKING(for kernel OProfile support)
-AX_COMPILE_OPTION(CONFIG_OPROFILE, OPROFILE_25=yes, OPROFILE_25=no)
-AX_COMPILE_OPTION(CONFIG_OPROFILE_MODULE, OPROFILE_25=yes, OPROFILE_25=$OPROFILE_25)
-AC_SUBST(OPROFILE_25)
-AC_MSG_RESULT($OPROFILE_25)
+	dnl Check for the minimal kernel version supported
+	AC_MSG_CHECKING(kernel version)
+	AX_KERNEL_VERSION(2, 2, 10, <=, AC_MSG_RESULT("ok"), AC_MSG_ERROR("check html documentation install section"))
 
-if test "$OPROFILE_25" = "no"; then
 	dnl Check if we need to build the module with extra flags
 	dnl FIXME this fix 2.5.19 and 2.5.20 build but perhaps its not the right way
 	AC_MSG_CHECKING([whether module compilation need -DMODULE])