Don't use ac_check_headers with the action to add driver to the list if

checking more than one header. It makes the driver appear several times in
the list of drivers to build. The driver will be built but fails to install
then (reported by D. Dumont). Use a nested way to check for headers instead.
This commit is contained in:
mmdolze
2011-03-12 22:36:48 +00:00
parent d06d06cba7
commit edcab9553f
2 changed files with 13 additions and 7 deletions
+12 -7
View File
@@ -426,18 +426,23 @@ dnl else
actdrivers=["$actdrivers SureElec"]
;;
svga)
AC_CHECK_HEADERS([vga.h vgagl.h],[
AC_CHECK_LIB(vga, main,[
LIBSVGA="-lvga -lvgagl"
DRIVERS="$DRIVERS svga${SO}"
actdrivers=["$actdrivers svga"]
AC_CHECK_HEADER([vga.h], [
AC_CHECK_HEADER([vgagl.h],[
AC_CHECK_LIB(vga, main,[
LIBSVGA="-lvga -lvgagl"
DRIVERS="$DRIVERS svga${SO}"
actdrivers=["$actdrivers svga"]
],[
dnl else
AC_MSG_WARN([The svga driver needs the vga library])
])
],[
dnl else
AC_MSG_WARN([The svga driver needs the vga library])
AC_MSG_WARN([The svga driver needs vgagl.h])
])
],[
dnl else
AC_MSG_WARN([The svga driver needs vga.h and vgagl.h])
AC_MSG_WARN([The svga driver needs vga.h])
])
;;
t6963)