callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Also check for SMlib.h; some Solaris systems have -lSM but not SMlib.h.

Browse Source 
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.

svn path=/trunk/; revision=57
This commit is contained in:
Tom Tromey
1998-03-02 22:34:42 +00:00
committed by Tom Tromey
parent 5dcf515056
commit c8ee176b4c
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
macros/ChangeLog
View File

@ -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> Sun Mar 1 17:49:42 1998 Tom Tromey <tromey@cygnus.com>
* gnome.m4 (GNOME_INIT): Changed spacing so --help output looks * gnome.m4 (GNOME_INIT): Changed spacing so --help output looks

17
macros/gnome-x-checks.m4
View File

@ -7,7 +7,10 @@ dnl X_{CFLAGS,LIBS} From AC_PATH_XTRA
dnl X_{PRE,EXTRA}_LIBS - do - dnl X_{PRE,EXTRA}_LIBS - do -
dnl x_libs Essentially $X_PRE_LIBS -lX11 -Xext $X_EXTRA_LIBS dnl x_libs Essentially $X_PRE_LIBS -lX11 -Xext $X_EXTRA_LIBS
dnl CPPFLAGS Will include $X_CFLAGS 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
dnl The following configure cache variables are defined (but not used): dnl The following configure cache variables are defined (but not used):
dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS} dnl gnome_cv_passdown_{x_libs,X_LIBS,X_CFLAGS}
@ -51,17 +54,23 @@ AC_DEFUN([GNOME_X_CHECKS],
case "$x_libs" in case "$x_libs" in
*-lSM*) *-lSM*)
dnl Already found it. dnl Already found it.
AC_DEFINE(HAVE_LIBSM)
;; ;;
*) *)
dnl Assume that if we have -lSM then we also have -lICE. dnl Assume that if we have -lSM then we also have -lICE.
AC_CHECK_LIB(SM, SmcSaveYourselfDone, 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) $x_libs -lICE)
;; ;;
esac 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, AC_CHECK_LIB(gtk, gdk_pixmap_unref,
GTK_LIBS="-lgtk -lgdk -lglib -lm", GTK_LIBS="-lgtk -lgdk -lglib -lm",
[AC_MSG_ERROR(Can not find a Gtk 0.99.1, probably you have an older version?)], [AC_MSG_ERROR(Can not find a Gtk 0.99.1, probably you have an older version?)],