* ltdl.m4 (AC_CHECK_HEADERS): Check for assert.h.

* libltdl/ltdl.c:  If not, disable assertions manually.

diff --git a/ChangeLog b/ChangeLog
index 6753a7030bdc569ea9f3149f097fafb481228c4c..27c973105f9aab3dde451322a1207211bfdb1d43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-13  Gary V. Vaughan  <gary@gnu.org>
+
+       * ltdl.m4 (AC_CHECK_HEADERS): Check for assert.h.
+       * libltdl/ltdl.c:  If not, disable assertions manually.
+
 2001-09-11  Gary V. Vaughan  <gary@gnu.org>
 
        * bootstrap: Be robust to having no files that need removing.

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index c47e31867690846cc501de423410b2d29bd3e5a4..19293f4d0942442c5418684f7aaac764b61311a0 100644 (file)
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -86,8 +86,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 #  include <argz.h>
 #endif
 
-/* I have never seen a system without this:  */
-#include <assert.h>
+#if HAVE_ASSERT_H
+#  include <assert.h>
+#else
+#  define assert(arg)  ((void) 0)
+#endif
 
 #include "ltdl.h"
 

diff --git a/ltdl.m4 b/ltdl.m4
index 749ca8b63911e359f6c428c054ace48663b010d7..5a7a970ddf6eacd306b255758e8de551fa4d2efa 100644 (file)
--- a/ltdl.m4
+++ b/ltdl.m4
@@ -45,7 +45,8 @@ AC_REQUIRE([AC_LTDL_DLSYM_USCORE])
 AC_REQUIRE([AC_LTDL_SYS_DLOPEN_DEPLIBS])
 AC_REQUIRE([AC_LTDL_FUNC_ARGZ])
 
-AC_CHECK_HEADERS([ctype.h errno.h malloc.h memory.h stdlib.h stdio.h unistd.h])
+AC_CHECK_HEADERS([assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
+                 stdio.h unistd.h])
 AC_CHECK_HEADERS([dl.h sys/dl.h dld.h])
 AC_CHECK_HEADERS([string.h strings.h], [break])