aboutsummaryrefslogtreecommitdiffstats
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-x-checks.m49
2 files changed, 13 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index c664537dce..6a82dff9bf 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 14 01:09:37 1998 Tom Tromey <tromey@cygnus.com>
+
+ * gnome-x-checks.m4: Only check for -lSM if not already in
+ x_libs.
+
1998-02-13 Raja R Harinath <harinath@cs.umn.edu>
* Makefile.am (EXTRA_DIST): Add `autogen.sh'.
diff --git a/macros/gnome-x-checks.m4 b/macros/gnome-x-checks.m4
index 4ffe519fe9..fef8a8fec8 100644
--- a/macros/gnome-x-checks.m4
+++ b/macros/gnome-x-checks.m4
@@ -29,12 +29,19 @@ AC_DEFUN([GNOME_X_CHECKS],
LDFLAGS="$saved_ldflags $X_LDFLAGS $X_LIBS"
dnl Assume that if we have -lSM then we also have -lICE.
- AC_CHECK_LIB(SM, SmcSaveYourselfDone,
+ case "$x_libs" in
+ *-lSM*)
+ # Already found it.
+ ;;
+ *)
+ AC_CHECK_LIB(SM, SmcSaveYourselfDone,
[AC_DEFINE(HAVE_LIBSM)
x_libs="$x_libs -lSM -lICE"], ,
$x_libs -lICE)
AM_CONDITIONAL(ENABLE_GSM,
test "x$ac_cv_lib_SM_SmcSaveYourselfDone" = "xyes")
+ ;;
+ esac
AC_CHECK_LIB(gtk, gdk_pixmap_unref,
GTK_LIBS="-lgtk -lgdk -lglib -lm",