diff options
| author | Nalin Dahyabhai <nalin@src.gnome.org> | 2003-07-21 15:11:26 +0000 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@src.gnome.org> | 2003-07-21 15:11:26 +0000 |
| commit | c1aff62f506b2bebd06ebd09d537cdee0e97d0fb (patch) | |
| tree | b719774a238a9e4e9880f473a3e428bbbc73c794 | |
| parent | c04dd7ce8bbc36fd717b2e1759ce072bb4d07ac8 (diff) | |
| download | vte-gnome-2-2.tar.gz | |
pull up from HEAD to add preprocessor definitions for Solaris (buggnome-2-2
* gnome-pty-helper/configure.in: pull up from HEAD to add preprocessor
definitions for Solaris (bug #117984).
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gnome-pty-helper/configure.in | 28 |
2 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,7 @@ +2003-07-21 nalin + * gnome-pty-helper/configure.in: pull up from HEAD to add preprocessor + definitions for Solaris (#117984). + 2003-07-03 nalin * src/vte.c(vte_terminal_set_termcap): add a missing piece of the previous change so that it works right. diff --git a/gnome-pty-helper/configure.in b/gnome-pty-helper/configure.in index ecae4eb3..60c8326d 100644 --- a/gnome-pty-helper/configure.in +++ b/gnome-pty-helper/configure.in @@ -12,20 +12,28 @@ AM_MAINTAINER_MODE PKG_CHECK_MODULES(GLIB,glib-2.0) AC_CHECK_HEADERS(sys/syslimits.h sys/time.h sys/types.h sys/un.h alloca.h lastlog.h libutil.h paths.h pty.h stropts.h termios.h ttyent.h util.h utmp.h utmpx.h pty.h util.h libutil.h ttyent.h) have_openpty=0 -AC_CHECK_FUNC(openpty,have_openpty=1,[AC_CHECK_LIB(util,openpty,[LIBS="$LIBS -lutil";have_openpty=1])]) -if test x$have_openpty = x1 ; then - AC_DEFINE(HAVE_OPENPTY,1,[Define if you have openpty() in libc or libutil]) -fi +AC_CHECK_LIB(c,grantpt,true,[AC_CHECK_LIB(pt,grantpt)]) +AC_CHECK_LIB(c,openpty,true,[AC_CHECK_LIB(util,openpty)]) +AC_CHECK_LIB(c,sendmsg,true,[AC_CHECK_LIB(socket,sendmsg,LIBS="$LIBS -lsocket -lnsl",,-lnsl)]) AC_CHECK_FUNCS(endutent fcntl forkpty getttyent getutent getutmpx grantpt flock login_tty openpty revoke sendmsg seteuid setreuid setutent strrchr updwtmp updwtmpx utmpname utmpxname) GPH_CHECK_UTMP AC_CHECK_HEADERS(stropts.h) -AM_CONFIG_HEADER(config.h) -if test x$ac_cv_func_grantpt = xyes; then - : -else - AC_CHECK_LIB(pt, grantpt) -fi +# Use all available features under glibc, and disable accidental use of +# deprecated functionality. +AC_EGREP_CPP(glibc, + [ + #include <stdio.h> + #ifdef __GLIBC__ + glibc + #endif + ], + AC_DEFINE(_GNU_SOURCE,1,[Use all glibc features.])) +AC_DEFINE(_XOPEN_SOURCE_EXTENDED,1,[Needed to get declarations for msg_control and msg_controllen on Solaris]) +AC_DEFINE(_XOPEN_SOURCE,1,[Needed to get declarations for msg_control and msg_controllen on Solaris]) +AC_DEFINE(__EXTENSIONS__,1,[Needed to get declarations for msg_control and msg_controllen on Solaris]) + +AM_CONFIG_HEADER(config.h) AC_OUTPUT(Makefile) |