Re: Debian package build fails due to duplicated svga driver in Makefile

-------- Original-Nachricht --------
> Datum: Sun, 13 Mar 2011 10:36:41 +0100
> Von: Dominique Dumont <[email protected]>
> An: [email protected]
> Betreff: Re: [Lcdproc] Debian package build fails due to duplicated svga	driver in Makefile

> Le jeudi 10 mars 2011 22:43:09, Markus Dolze a écrit :
> > Because AC_CHECK_HEADERS checks for two headers, action if found is run
> > two times, thus the driver is added two times.
> 
> Thanks for pointing me in the right direction.
> 
> Here's a hack on configure that enables me to build the package:
> 
> --- a/configure
> +++ b/configure
> @@ -8326,10 +8326,12 @@
>  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_vga_main" >&5
>  $as_echo "$ac_cv_lib_vga_main" >&6; }
>  if test "x$ac_cv_lib_vga_main" = xyes; then :
> -
> +       if test "x$svga_done" != xyes; then :
>                                         LIBSVGA="-lvga -lvgagl"
>                                         DRIVERS="$DRIVERS svga${SO}"
>                                         actdrivers="$actdrivers svga"
> +                                       svga_done="yes"
> +    fi
>  
>  else
>  
> I guess that a similar hack can be used in the shell snippet in
> acinclude.m4
> 
> Hope this helps
> 
> Dominique

Hi,

thank you for your input.

I have commited a change to CVS yesterday which does checking for the headers in a different way (patch attached). You may try with a stock 0.5.4 if it works for you, too.

Additionally I have updated the known bugs sections of the readme on the download page.

Regards,
Markus

_______________________________________________
LCDproc mailing list
[email protected]
http://lists.omnipotent.net/mailman/listinfo/lcdproc

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/acinclude.m4,v
retrieving revision 1.114
diff -u -r1.114 acinclude.m4
--- acinclude.m4	10 Jan 2011 06:47:44 -0000	1.114
+++ acinclude.m4	12 Mar 2011 22:27:55 -0000
@@ -426,18 +426,23 @@
 			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)