[oprof-cvs] CVS: oprofile ChangeLog,1.215,1.216 acinclude.m4,1.6,1.7 configure.in,1.52,1.53

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

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

Modified Files:
	ChangeLog acinclude.m4 configure.in 
Log Message:
fixes for release



Index: ChangeLog
===================================================================
RCS file: /cvsroot/oprofile/oprofile/ChangeLog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- ChangeLog	2001/11/07 01:40:28	1.215
+++ ChangeLog	2001/11/07 19:43:46	1.216
@@ -1,5 +1,13 @@
 2001-11-07  John Levon  <mo...@co...>
 
+	* acinclude.m4:
+	* configure.in: fixes for configuration when Qt2 not found
+
+	* child_reader.h:
+	* child_reader.cpp: compile with gcc 3.0
+ 
+2001-11-07  John Levon  <mo...@co...>
+
 	* configure.in: bump to 0.0.7
  
 2001-11-07  John Levon  <mo...@co...>

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/oprofile/oprofile/acinclude.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- acinclude.m4	2001/10/14 19:35:13	1.6
+++ acinclude.m4	2001/11/07 19:43:46	1.7
@@ -287,8 +287,6 @@
 
 eval "$ac_cv_have_qt2"
 
-ac_cv_have_qt2="have_qt2=yes ac_qt2_name=$ac_qt2_name \
-  ac_qt2_includes=$ac_qt2_includes ac_qt2_libraries=$ac_qt2_libraries"
 if test "$have_qt2" != yes; then
   AC_MSG_RESULT([$have_qt2]);
 else
@@ -303,21 +301,39 @@
   CXXFLAGS="$CXXFLAGS -I$qt2_includes -L$qt2_libraries"
   dnl specify we are definitely C++ compiling first
   AC_LANG_CPLUSPLUS
+
+  dnl first check we can compile 
   AC_TRY_COMPILE([
   #include <qglobal.h>
-  ],
-    [
-    #if (QT_VERSION < 221)
-    break_me_(\\\);
-    #endif
   ],
+  [],
   ac_qt2_ok=yes,
   ac_qt2_ok=no
   )
-  test "$ac_qt2_ok" = no && AC_MSG_ERROR([Found an earlier version of Qt - you must specify the path to Qt2])
+
+  if test "$ac_qt2_ok" = "yes"; then 
+    AC_TRY_COMPILE([
+    #include <qglobal.h>
+    ],
+      [
+      #if (QT_VERSION < 221)
+      break_me_(\\\);
+      #endif
+    ],
+    ac_qt2_ok=yes,
+    ac_qt2_ok=no
+    )
+    test "$ac_qt2_ok" = no && AC_MSG_WARN([Found an earlier version of Qt - you must specify the path to Qt2])
+  fi
+ 
   CXXFLAGS="$SAVE_CXXFLAGS"
+
+  have_qt2=$ac_qt2_ok
 fi
 
+ac_cv_have_qt2="have_qt2=$have_qt2 ac_qt2_name=$ac_qt2_name \
+  ac_qt2_includes=$ac_qt2_includes ac_qt2_libraries=$ac_qt2_libraries"
+ 
 AC_SUBST(qt2_libraries)
 AC_SUBST(qt2_includes)
 

Index: configure.in
===================================================================
RCS file: /cvsroot/oprofile/oprofile/configure.in,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- configure.in	2001/11/07 01:40:28	1.52
+++ configure.in	2001/11/07 19:43:46	1.53
@@ -200,6 +200,8 @@
  
 # C++ tests
  
+AC_LANG_CPLUSPLUS
+
 QT2_DO_IT_ALL
  
 AC_MSG_CHECKING("popt prototype")