diff -crN ./gnome-common/macros2/check-utmp.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-common/macros2/check-utmp.m4
*** ./gnome-common/macros2/check-utmp.m4	Mon Jul 24 16:55:17 2000
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-common/macros2/check-utmp.m4	Thu Feb  6 15:25:09 2003
***************
*** 10,16 ****
  
  AC_DEFUN(AC_CHECK_UTMP,[
  
! AC_CHECK_HEADERS(sys/time.h utmp.h utmpx.h)
  AC_HEADER_TIME
  
  if test "$ac_cv_header_utmpx_h" = "yes"; then
--- 10,16 ----
  
  AC_DEFUN(AC_CHECK_UTMP,[
  
! AC_CHECK_HEADERS(sys/time.h utmpx.h)
  AC_HEADER_TIME
  
  if test "$ac_cv_header_utmpx_h" = "yes"; then
***************
*** 19,24 ****
--- 19,49 ----
      AC_DEFINE(UTMP,[struct utmp])
  fi
  
+ dnl some systems (AIX) can't include both files utmp.h and utmpx.h
+ 
+ AH_TEMPLATE(HAVE_UTMP_H, [Define to 1 if you have the <utmp.h> header file.])
+ 
+ AC_CHECK_HEADER(utmp.h,[
+ AC_MSG_CHECKING(if we can include both files utmp.h utmpx.h)
+ AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
+ #include <sys/time.h>
+ #include <time.h>
+ #else
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #else
+ #include <time.h>
+ #endif
+ #endif
+ #include <utmp.h>
+ #ifdef HAVE_UTMPX_H
+ #include <utmpx.h>
+ #endif],[UTMP ut;],result=yes,result=no)
+ if test "$result" = "yes"; then
+   AC_DEFINE(HAVE_UTMP_H)
+ fi
+ AC_MSG_RESULT($result)])
+ 
  dnl some systems (BSD4.4-like) require time.h to be included before utmp.h :/
  AC_MSG_CHECKING(for ut_host field in the utmp structure)
  AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
diff -crN ./gnome-common/macros2/gnome-cxx-check.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-common/macros2/gnome-cxx-check.m4
*** ./gnome-common/macros2/gnome-cxx-check.m4	Mon Jul 24 16:27:58 2000
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-common/macros2/gnome-cxx-check.m4	Tue Apr 15 13:48:28 2003
***************
*** 3,8 ****
--- 3,9 ----
  [
    # see if a C++ compiler exists and works
    AC_REQUIRE([AC_PROG_CXX])dnl
+   AC_CHECK_PROG(ac_cv_prog_cxx_works, $CXX, yes, no)
    if test "x$ac_cv_prog_cxx_works" = xno; then
      AC_MSG_WARN(ifelse([$1], , "No C++ compiler", [$1]))
    fi