diff --git a/configure.ac b/configure.ac
index 558acab3..7564f63f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,7 +66,7 @@ AC_SEARCH_LIBS(getopt, iberty)
 AC_CHECK_FUNCS(strtoimax strtoll)
 AC_CHECK_FUNCS(mergesort)
 AC_CHECK_FUNCS(mkstemps)
-AC_CHECK_DECL(alloca)
+AC_CHECK_DECLS(alloca strcasecmp)
 AC_TRY_LINK_FUNC([symlink],[AC_DEFINE([HAVE_SYMLINK], 1, [Define to 1 if you have the symlink function.])])
 
 AC_OUTPUT(				\
diff --git a/libasn1fix/asn1fix_internal.h b/libasn1fix/asn1fix_internal.h
index 3ccae818..cfd9ceca 100644
--- a/libasn1fix/asn1fix_internal.h
+++ b/libasn1fix/asn1fix_internal.h
@@ -27,8 +27,10 @@
 #define	EX_NOINPUT	66
 #define	EX_DATAERR	65
 #define	snprintf	_snprintf
+#if defined HAVE_DECL_STRCASECMP && !HAVE_DECL_STRCASECMP
 #define	strcasecmp	stricmp
 #endif
+#endif
 
 #ifndef	ETOOMANYREFS
 #define	ETOOMANYREFS	144