summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu.herrb@laas.fr>2006-11-05 18:12:02 +0100
committerMatthieu Herrb <matthieu@cortez.herrb.com>2006-11-05 18:12:02 +0100
commit6dd36416843d033b041864c78832bb4fa6c66fd2 (patch)
tree609dfe2515982edde598bdada7e60a9fb2a6b1aa
parent9935b3093922798e26d79ae7182d86e0cafa91f5 (diff)
Build fix for systems with <elf_abi.h> instead of <elf.h>. Bugzilla #7707.
-rw-r--r--configure.ac1
-rw-r--r--src/vloaduc.c7
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c80a292..257444a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for header files.
AC_HEADER_STDC
+AC_CHECK_HEADERS([elf.h] [elf_abi.h])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff --git a/src/vloaduc.c b/src/vloaduc.c
index ff281e8..9f3e17e 100644
--- a/src/vloaduc.c
+++ b/src/vloaduc.c
@@ -12,12 +12,17 @@
#include "v1krisc.h"
#include "vloaduc.h"
#include "vos.h"
-#include "elf.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <stdio.h>
+#ifdef HAVE_ELF_H
+#include <elf.h>
+#endif
+#ifdef HAVE_ELF_ABI_H
+#include <elf_abi.h>
+#endif
/*
* defines