configure.ac: query video driver directory via pkg-config

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

configure.ac

@@ -46,11 +46,9 @@ AH_TOP([#include "xorg-server.h"])
 
 # Define a configure option for an alternate module directory
 PKG_PROG_PKG_CONFIG([0.25])
-AC_ARG_WITH(xorg-module-dir,
-            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                           [Default xorg module directory]),
-            [moduledir="$withval"],
-            [moduledir=`$PKG_CONFIG --variable=moduledir xorg-server`])
+
+xlibre_video_drivers_dir=`$PKG_CONFIG --variable=video_drivers_dir xlibre-server`
+AC_SUBST(xlibre_video_drivers_dir)
 
 # Store the list of server defined optional extensions in REQUIRED_MODULES
 XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -62,7 +60,5 @@ PKG_CHECK_MODULES(XORG, [xorg-server >= 25.0.0 xproto fontsproto $REQUIRED_MODUL
 PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
 XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 
-AC_SUBST([moduledir])
-
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT

src/Makefile.am

@@ -26,7 +26,7 @@
 AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS)
 fbdev_drv_la_LTLIBRARIES = fbdev_drv.la
 fbdev_drv_la_LDFLAGS = -module -avoid-version
-fbdev_drv_ladir = @moduledir@/drivers
+fbdev_drv_ladir = @xlibre_video_drivers_dir@
 
 fbdev_drv_la_SOURCES = \
          fbdev.c

src/fbdev.c

@@ -58,7 +58,7 @@ static void *	FBDevWindowLinear(ScreenPtr pScreen, CARD32 row, CARD32 offset, in
 static void	FBDevPointerMoved(ScrnInfoPtr pScrn, int x, int y);
 static Bool	FBDevDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen);
 static Bool	FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
-				pointer ptr);
+				void *ptr);
 
 
 enum { FBDEV_ROTATE_NONE=0, FBDEV_ROTATE_CW=270, FBDEV_ROTATE_UD=180, FBDEV_ROTATE_CCW=90 };
@@ -137,15 +137,15 @@ static XF86ModuleVersionInfo FBDevVersRec =
 
 _X_EXPORT XF86ModuleData fbdevModuleData = { &FBDevVersRec, FBDevSetup, NULL };
 
-pointer
-FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+void*
+FBDevSetup(void *module, void *opts, int *errmaj, int *errmin)
 {
 	static Bool setupDone = FALSE;
 
 	if (!setupDone) {
 		setupDone = TRUE;
 		xf86AddDriver(&FBDEV, module, HaveDriverFuncs);
-		return (pointer)1;
+		return (void*)1;
 	} else {
 		if (errmaj) *errmaj = LDR_ONCEONLY;
 		return NULL;
@@ -1175,7 +1175,7 @@ FBDevDGAInit(ScrnInfoPtr pScrn, ScreenPtr pScreen)
 }
 
 static Bool
-FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
+FBDevDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, void *ptr)
 {
     xorgHWFlags *flag;