diff -crN ./libzvt/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/Makefile.in *** ./libzvt/Makefile.in Thu Jun 19 08:33:42 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/Makefile.in Wed Aug 13 00:18:03 2003 *************** *** 110,118 **** install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS acconfig.h acinclude.m4 \ ! aclocal.m4 config.guess config.h.in config.sub configure \ ! configure.in install-sh ltmain.sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive --- 110,118 ---- install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README ./stamp-h.in AUTHORS COPYING COPYING.LIB ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 \ ! config.guess config.h.in config.sub configure configure.in \ ! install-sh ltmain.sh missing mkinstalldirs DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive *************** *** 140,146 **** $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h @if test ! -f $@; then \ --- 140,146 ---- $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) ! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h @if test ! -f $@; then \ diff -crN ./libzvt/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/aclocal.m4 *** ./libzvt/aclocal.m4 Thu Jun 19 08:33:12 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/aclocal.m4 Wed Aug 13 00:17:41 2003 *************** *** 11,260 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. - # Checks for availability of various utmp fields - # - # Original code by Bernhard Rosenkraenzer (bero@linux.net.eu.org), 1998. - # Modifications by Timur Bakeyev (timur@gnu.org), 1999. - # - - dnl AC_CHECK_UTMP() - dnl Test for presence of the field and define HAVE_UT_UT_field macro - dnl - - 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 - AC_DEFINE(UTMP,[struct utmpx]) - else - AC_DEFINE(UTMP,[struct utmp]) - fi - - 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 - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; char *p; p=ut.ut_host;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_HOST) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_pid field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; int i; i=ut.ut_pid;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_PID) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_id field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; char *p; p=ut.ut_id;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_ID) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_name field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; char *p; p=ut.ut_name;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_NAME) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_type field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; int i; i=(int) ut.ut_type;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_TYPE) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_exit.e_termination field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; ut.ut_exit.e_termination=0;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_EXIT_E_TERMINATION) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_user field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; char *p; p=ut.ut_user;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_USER) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_time field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; ut.ut_time=0;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_TIME) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_tv field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_TV) - fi - AC_MSG_RESULT($result) - - AC_MSG_CHECKING(for ut_syslen field in the utmp structure) - AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME - #include - #include - #else - #ifdef HAVE_SYS_TIME_H - #include - #else - #include - #endif - #endif - #ifdef HAVE_UTMP_H - #include - #endif - #ifdef HAVE_UTMPX_H - #include - #endif],[UTMP ut; ut.ut_syslen=0;],result=yes,result=no) - if test "$result" = "yes"; then - AC_DEFINE(HAVE_UT_UT_SYSLEN) - fi - AC_MSG_RESULT($result) - - ]) - # Like AC_CONFIG_HEADER, but automatically create stamp file. # serial 3 --- 11,16 ---- *************** *** 4324,4329 **** --- 4080,4354 ---- # This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL]) + # Checks for availability of various utmp fields + # + # Original code by Bernhard Rosenkraenzer (bero@linux.net.eu.org), 1998. + # Modifications by Timur Bakeyev (timur@gnu.org), 1999. + # + + dnl AC_CHECK_UTMP() + dnl Test for presence of the field and define HAVE_UT_UT_field macro + dnl + + 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 + AC_DEFINE(UTMP,[struct utmpx]) + else + 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 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 + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #include + #ifdef HAVE_UTMPX_H + #include + #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 + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; char *p; p=ut.ut_host;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_HOST) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_pid field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; int i; i=ut.ut_pid;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_PID) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_id field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; char *p; p=ut.ut_id;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_ID) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_name field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; char *p; p=ut.ut_name;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_NAME) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_type field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; int i; i=(int) ut.ut_type;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_TYPE) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_exit.e_termination field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; ut.ut_exit.e_termination=0;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_EXIT_E_TERMINATION) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_user field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; char *p; p=ut.ut_user;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_USER) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_time field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; ut.ut_time=0;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_TIME) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_tv field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; ut.ut_tv={0, 0};],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_TV) + fi + AC_MSG_RESULT($result) + + AC_MSG_CHECKING(for ut_syslen field in the utmp structure) + AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #ifdef HAVE_UTMP_H + #include + #endif + #ifdef HAVE_UTMPX_H + #include + #endif],[UTMP ut; ut.ut_syslen=0;],result=yes,result=no) + if test "$result" = "yes"; then + AC_DEFINE(HAVE_UT_UT_SYSLEN) + fi + AC_MSG_RESULT($result) + + ]) + dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page diff -crN ./libzvt/config.h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/config.h.in *** ./libzvt/config.h.in Thu Jun 19 08:33:39 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/config.h.in Wed Aug 13 00:18:00 2003 *************** *** 36,41 **** --- 36,47 ---- #undef HAVE_LIBUTIL + /* "use /dev/ptc to open master pty" */ + #undef HAVE_DEV_PTC + + /* "use /dev/ptmx to open master pty" */ + #undef HAVE_DEV_PTMX + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff -crN ./libzvt/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/configure *** ./libzvt/configure Thu Jun 19 08:33:47 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/configure Wed Aug 13 00:18:07 2003 *************** *** 8263,8270 **** ! ! for ac_header in sys/time.h utmp.h utmpx.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then --- 8263,8269 ---- ! for ac_header in sys/time.h utmpx.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then *************** *** 8447,8452 **** --- 8446,8622 ---- fi + + + + + if test "${ac_cv_header_utmp_h+set}" = set; then + echo "$as_me:$LINENO: checking for utmp.h" >&5 + echo $ECHO_N "checking for utmp.h... $ECHO_C" >&6 + if test "${ac_cv_header_utmp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi + echo "$as_me:$LINENO: result: $ac_cv_header_utmp_h" >&5 + echo "${ECHO_T}$ac_cv_header_utmp_h" >&6 + else + # Is the header compilable? + echo "$as_me:$LINENO: checking utmp.h usability" >&5 + echo $ECHO_N "checking utmp.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + $ac_includes_default + #include + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_compiler=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? + echo "$as_me:$LINENO: checking utmp.h presence" >&5 + echo $ECHO_N "checking utmp.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + #include + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi + else + ac_cpp_err=yes + fi + if test -z "$ac_cpp_err"; then + ac_header_preproc=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_header_preproc=no + fi + rm -f conftest.err conftest.$ac_ext + echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 + echo "${ECHO_T}$ac_header_preproc" >&6 + + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc in + yes:no ) + { echo "$as_me:$LINENO: WARNING: utmp.h: accepted by the compiler, rejected by the preprocessor!" >&5 + echo "$as_me: WARNING: utmp.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: utmp.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: utmp.h: proceeding with the preprocessor's result" >&2;};; + no:yes ) + { echo "$as_me:$LINENO: WARNING: utmp.h: present but cannot be compiled" >&5 + echo "$as_me: WARNING: utmp.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: utmp.h: check for missing prerequisite headers?" >&5 + echo "$as_me: WARNING: utmp.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: utmp.h: proceeding with the preprocessor's result" >&5 + echo "$as_me: WARNING: utmp.h: proceeding with the preprocessor's result" >&2;};; + esac + echo "$as_me:$LINENO: checking for utmp.h" >&5 + echo $ECHO_N "checking for utmp.h... $ECHO_C" >&6 + if test "${ac_cv_header_utmp_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_header_utmp_h=$ac_header_preproc + fi + echo "$as_me:$LINENO: result: $ac_cv_header_utmp_h" >&5 + echo "${ECHO_T}$ac_cv_header_utmp_h" >&6 + + fi + if test $ac_cv_header_utmp_h = yes; then + + echo "$as_me:$LINENO: checking if we can include both files utmp.h utmpx.h" >&5 + echo $ECHO_N "checking if we can include both files utmp.h utmpx.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" + #ifdef TIME_WITH_SYS_TIME + #include + #include + #else + #ifdef HAVE_SYS_TIME_H + #include + #else + #include + #endif + #endif + #include + #ifdef HAVE_UTMPX_H + #include + #endif + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + int + main () + { + UTMP ut; + ; + return 0; + } + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + result=yes + else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + result=no + fi + rm -f conftest.$ac_objext conftest.$ac_ext + if test "$result" = "yes"; then + cat >>confdefs.h <<\_ACEOF + #define HAVE_UTMP_H 1 + _ACEOF + + fi + echo "$as_me:$LINENO: result: $result" >&5 + echo "${ECHO_T}$result" >&6 + fi + + + echo "$as_me:$LINENO: checking for ut_host field in the utmp structure" >&5 echo $ECHO_N "checking for ut_host field in the utmp structure... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF *************** *** 8981,8987 **** int main () { ! UTMP ut; ut.ut_tv.tv_sec=0; ut.ut_tv.tv_usec=0; ; return 0; } --- 9151,9157 ---- int main () { ! UTMP ut; ut.ut_tv={0, 0}; ; return 0; } *************** *** 9327,9332 **** --- 9497,9528 ---- UTIL_LIBS="-lutil" + else + + echo "$as_me:$LINENO: checking for master pty device name" >&5 + echo $ECHO_N "checking for master pty device name... $ECHO_C" >&6 + if test -r /dev/ptmx ; then + echo "$as_me:$LINENO: result: /dev/ptmx" >&5 + echo "${ECHO_T}/dev/ptmx" >&6 + + cat >>confdefs.h <<\_ACEOF + #define HAVE_DEV_PTMX + _ACEOF + + elif test -r /dev/ptc ; then + echo "$as_me:$LINENO: result: /dev/ptc" >&5 + echo "${ECHO_T}/dev/ptc" >&6 + + cat >>confdefs.h <<\_ACEOF + #define HAVE_DEV_PTC + _ACEOF + + else + { { echo "$as_me:$LINENO: error: \"Don't know how to open master pty\"" >&5 + echo "$as_me: error: \"Don't know how to open master pty\"" >&2;} + { (exit 1); exit 1; }; } + fi + fi diff -crN ./libzvt/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/install-sh *** ./libzvt/install-sh Thu Jun 19 08:33:41 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/install-sh Wed Aug 13 00:18:02 2003 *************** *** 196,202 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else --- 196,202 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst || true; else true ; fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi else *************** *** 237,243 **** if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. --- 237,243 ---- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && ! if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp || true; else true;fi && if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && # Now rename the file to the real destination. diff -crN ./libzvt/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/ltmain.sh *** ./libzvt/ltmain.sh Thu Jun 19 08:33:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libzvt/ltmain.sh Wed Aug 13 00:17:42 2003 *************** *** 3919,3924 **** --- 3919,3925 ---- tdlname=$dlname case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *aix*,*,*,*,*) tdlname=$realname\($dlname\) ;; esac $echo > $output "\ # $outputname - a libtool library file