diff --git a/ChangeLog b/ChangeLog
index 9d592c1..fdcfd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-01-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
+	* configure.ac: If configure is invoked with --enable-snmp, but
+	  the configure script is unable to find SNMP support on the platform,
+	  then configure should give an error message and exit.
+
+2005-01-12 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
 	* redhat/quagga.spec.in: Pass --enable-gcc-rdynamic to configure
 	  to get gcc to link with -rdynamic for better backtraces.
 	  When the rpm is upgraded, the restart logic now works as follows:
diff --git a/configure.ac b/configure.ac
index 8b69d70..61a00d9 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.85 2005/01/07 14:17:39 paul Exp $
+## $Id: configure.ac,v 1.86 2005/01/12 16:52:55 ajs Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(Quagga, 0.98.0, [http://bugzilla.quagga.net])
@@ -950,6 +950,10 @@
   fi
 fi
 
+if test "${enable_snmp}" = "yes" -a "${HAVE_SNMP}" != "yes"; then
+  AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])
+fi
+
 dnl ----------------------------
 dnl check sa_len of sockaddr
 dnl ----------------------------