configure.ac: Fix KDrive VESA/fbdev conditionals
Make sure we actually respect anything explicitly given on the configure line, instead of just stomping it with what we detect.
This commit is contained in:
		
							parent
							
								
									f37612c6f2
								
							
						
					
					
						commit
						fd10312b42
					
				| 
						 | 
					@ -1838,8 +1838,6 @@ AM_CONDITIONAL(XSDLSERVER, [test x"$XSDL" = xyes])
 | 
				
			||||||
AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 | 
					AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
 | 
				
			||||||
AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
 | 
					AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
 | 
				
			||||||
AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
 | 
					AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
 | 
				
			||||||
AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
 | 
					 | 
				
			||||||
AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
 | 
					dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
 | 
				
			||||||
AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
 | 
					AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue