diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/ChangeLog | 5 | ||||
| -rw-r--r-- | macros/gnome-x-checks.m4 | 17 |
2 files changed, 18 insertions, 4 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index ea227b34a5..e4ded3d763 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 2 15:27:44 1998 Tom Tromey <tromey@cygnus.com> + + * gnome-x-checks.m4 (GNOME_X_CHECKS): Also check for SMlib.h; some + Solaris systems have -lSM but not SMlib.h. + Sun Mar 1 17:49:42 1998 Tom Tromey <tromey@cygnus.com> * gnome.m4 (GNOME_INIT): Changed spacing so --help output looks diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4 index 2af8add65a..d5df4ea384 100644 --- a/macros/gnome-x-checks.m4 +++ b/macros/gnome-x-checks.m4 @@ -7,7 +7,10 @@ dnl X_{CFLAGS,LIBS} From AC_PATH_XTRA dnl X_{PRE,EXTRA}_LIBS - do - dnl x_libs Essentially $X_PRE_LIBS -lX11 -Xext $X_EXTRA_LIBS dnl CPPFLAGS Will include $X_CFLAGS -dnl GNOME_HAVE_SM `true' or `false' depending of if -lSM is present +dnl GNOME_HAVE_SM `true' or `false' depending on whether session +dnl management is available. It is available if +dnl both -lSM and X11/SM/SMlib.h exist. (Some +dnl Solaris boxes have the library but not the header) dnl dnl The following configure cache variables are defined (but not used): dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} @@ -51,17 +54,23 @@ AC_DEFUN([GNOME_X_CHECKS], case "$x_libs" in *-lSM*) dnl Already found it. - AC_DEFINE(HAVE_LIBSM) ;; *) dnl Assume that if we have -lSM then we also have -lICE. AC_CHECK_LIB(SM, SmcSaveYourselfDone, - [AC_DEFINE(HAVE_LIBSM) - x_libs="$x_libs -lSM -lICE"],GNOME_HAVE_SM=false, + [x_libs="$x_libs -lSM -lICE"],GNOME_HAVE_SM=false, $x_libs -lICE) ;; esac + if test "$GNOME_HAVE_SM" = true; then + AC_CHECK_HEADERS(X11/SM/SMlib.h,,GNOME_HAVE_SM=false) + fi + + if test "$GNOME_HAVE_SM" = true; then + AC_DEFINE(HAVE_LIBSM) + fi + AC_CHECK_LIB(gtk, gdk_pixmap_unref, GTK_LIBS="-lgtk -lgdk -lglib -lm", [AC_MSG_ERROR(Can not find a Gtk 0.99.1, probably you have an older version?)], |