From: Andre Noll <maan@congo.fml.local>
Date: Fri, 11 Aug 2006 15:01:29 +0000 (+0200)
Subject: fix conflict
X-Git-Tag: v0.2.14~58
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=b8741e4cfa64333e719f7b3abe38b94ef961b39d

fix conflict
---

diff --git a/configure.ac b/configure.ac
index 855c17d5..77534de2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h \
-	string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h malloc.h], \
+	string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h], \
 	[], [AC_MSG_ERROR([$ac_header not found])])
 
 AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"],