From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 13 Sep 2001 19:43:58 +0000 (+0000)
Subject: * ltdl.m4 (AC_CHECK_HEADERS): Check for assert.h.
X-Git-Tag: release-1-4d~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7eba1343df0a439692a9bc9edbd1a66093148241;p=thirdparty%2Flibtool.git

* ltdl.m4 (AC_CHECK_HEADERS): Check for assert.h.
* libltdl/ltdl.c:  If not, disable assertions manually.
---

diff --git a/ChangeLog b/ChangeLog
index 6753a7030..27c973105 100644
--- 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 c47e31867..19293f4d0 100644
--- 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 749ca8b63..5a7a970dd 100644
--- 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])