Building drivers when Xserver installed in $RPM_BUILD_ROOT
Stefan Dirsch
sndirsch at suse.de
Sun Jul 31 19:50:37 EST 2005
Hi
Currently I'm using the following patch to build the drivers, because
the Xserver is installed in $RPM_BUILD_ROOT and otherwise the include
files won't be found. XORG_INCS + XORG_CFLAGS + DRI_CFLAGS needs to be
set for this, e.g.
export XORG_CFLAGS="$(pkg-config --cflags xorg-server) -I$RPM_BUILD_ROOT/usr/include -I$RPM_BUILD_ROOT/usr/include/xorg"
export DRI_CFLAGS="$(pkg-config --cflags xf86driproto) -I$RPM_BUILD_ROOT/usr/include/ -I$RPM_BUILD_ROOT/usr/include/X11/dri -I$RPM_BUILD_ROOT/usr/include/xorg"
export XORG_INCS="-I$RPM_BUILD_ROOT/usr/include/ -I$RPM_BUILD_ROOT/usr/include/xorg"
Any ideas how to do it without this huge patch or with an improved
version of this patch? BTW, hunks for xf86-video-sun*/xf86-video-tga
are missing since I don't build them (on Linux).
Best regards,
Stefan
Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.) SUSE LINUX Products GmbH
Tel: 0911-740 53 0 Maxfeldstraße 5
FAX: 0911-740 53 479 D-90409 Nürnberg
http://www.suse.de Germany
------------------------------------------------------
-------------- next part --------------
diff -u -r driver.orig/xf86-input-acecad/configure.ac driver/xf86-input-acecad/configure.ac
--- driver.orig/xf86-input-acecad/configure.ac 2005-07-25 11:48:28.555223173 +0200
+++ driver/xf86-input-acecad/configure.ac 2005-07-25 11:50:35.471075248 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-aiptek/configure.ac driver/xf86-input-aiptek/configure.ac
--- driver.orig/xf86-input-aiptek/configure.ac 2005-07-25 11:48:28.705197002 +0200
+++ driver/xf86-input-aiptek/configure.ac 2005-07-25 11:50:35.528065302 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-calcomp/configure.ac driver/xf86-input-calcomp/configure.ac
--- driver.orig/xf86-input-calcomp/configure.ac 2005-07-25 11:48:31.065785070 +0200
+++ driver/xf86-input-calcomp/configure.ac 2005-07-25 11:50:35.541063034 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-citron/configure.ac driver/xf86-input-citron/configure.ac
--- driver.orig/xf86-input-citron/configure.ac 2005-07-25 11:48:28.772185312 +0200
+++ driver/xf86-input-citron/configure.ac 2005-07-25 11:50:35.556060417 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-digitaledge/configure.ac driver/xf86-input-digitaledge/configure.ac
--- driver.orig/xf86-input-digitaledge/configure.ac 2005-07-25 11:48:29.949979782 +0200
+++ driver/xf86-input-digitaledge/configure.ac 2005-07-25 11:50:35.570057974 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-dmc/configure.ac driver/xf86-input-dmc/configure.ac
--- driver.orig/xf86-input-dmc/configure.ac 2005-07-25 11:48:30.941806704 +0200
+++ driver/xf86-input-dmc/configure.ac 2005-07-25 11:50:35.584055531 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-dynapro/configure.ac driver/xf86-input-dynapro/configure.ac
--- driver.orig/xf86-input-dynapro/configure.ac 2005-07-25 11:48:34.821129746 +0200
+++ driver/xf86-input-dynapro/configure.ac 2005-07-25 11:50:35.598053089 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-elo2300/configure.ac driver/xf86-input-elo2300/configure.ac
--- driver.orig/xf86-input-elo2300/configure.ac 2005-07-25 11:48:34.364209480 +0200
+++ driver/xf86-input-elo2300/configure.ac 2005-07-25 11:50:35.616049948 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-elographics/configure.ac driver/xf86-input-elographics/configure.ac
--- driver.orig/xf86-input-elographics/configure.ac 2005-07-25 11:48:32.977451476 +0200
+++ driver/xf86-input-elographics/configure.ac 2005-07-25 11:50:35.636046458 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-evdev/configure.ac driver/xf86-input-evdev/configure.ac
--- driver.orig/xf86-input-evdev/configure.ac 2005-07-25 11:48:28.244277434 +0200
+++ driver/xf86-input-evdev/configure.ac 2005-07-25 11:50:35.653043492 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-fpit/configure.ac driver/xf86-input-fpit/configure.ac
--- driver.orig/xf86-input-fpit/configure.ac 2005-07-25 11:48:33.038440833 +0200
+++ driver/xf86-input-fpit/configure.ac 2005-07-25 11:50:35.667041049 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-hyperpen/configure.ac driver/xf86-input-hyperpen/configure.ac
--- driver.orig/xf86-input-hyperpen/configure.ac 2005-07-25 11:48:31.257751571 +0200
+++ driver/xf86-input-hyperpen/configure.ac 2005-07-25 11:50:35.681038606 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-jamstudio/configure.ac driver/xf86-input-jamstudio/configure.ac
--- driver.orig/xf86-input-jamstudio/configure.ac 2005-07-25 11:48:29.775010315 +0200
+++ driver/xf86-input-jamstudio/configure.ac 2005-07-25 11:50:35.695036164 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-joystick/configure.ac driver/xf86-input-joystick/configure.ac
--- driver.orig/xf86-input-joystick/configure.ac 2005-07-25 11:48:31.001796236 +0200
+++ driver/xf86-input-joystick/configure.ac 2005-07-25 11:50:35.710033546 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-keyboard/configure.ac driver/xf86-input-keyboard/configure.ac
--- driver.orig/xf86-input-keyboard/configure.ac 2005-07-25 11:48:31.197762039 +0200
+++ driver/xf86-input-keyboard/configure.ac 2005-07-25 11:50:35.728030406 +0200
@@ -84,7 +84,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-magellan/configure.ac driver/xf86-input-magellan/configure.ac
--- driver.orig/xf86-input-magellan/configure.ac 2005-07-25 11:48:34.427198489 +0200
+++ driver/xf86-input-magellan/configure.ac 2005-07-25 11:50:35.741028138 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-magictouch/configure.ac driver/xf86-input-magictouch/configure.ac
--- driver.orig/xf86-input-magictouch/configure.ac 2005-07-25 11:48:31.780660321 +0200
+++ driver/xf86-input-magictouch/configure.ac 2005-07-25 11:50:35.756025520 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-microtouch/configure.ac driver/xf86-input-microtouch/configure.ac
--- driver.orig/xf86-input-microtouch/configure.ac 2005-07-25 11:48:29.838999149 +0200
+++ driver/xf86-input-microtouch/configure.ac 2005-07-25 11:50:35.770023078 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-mouse/configure.ac driver/xf86-input-mouse/configure.ac
--- driver.orig/xf86-input-mouse/configure.ac 2005-07-25 11:48:28.313265395 +0200
+++ driver/xf86-input-mouse/configure.ac 2005-07-25 11:50:35.787020111 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-mutouch/configure.ac driver/xf86-input-mutouch/configure.ac
--- driver.orig/xf86-input-mutouch/configure.ac 2005-07-25 11:48:28.845172575 +0200
+++ driver/xf86-input-mutouch/configure.ac 2005-07-25 11:50:35.808016447 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-palmax/configure.ac driver/xf86-input-palmax/configure.ac
--- driver.orig/xf86-input-palmax/configure.ac 2005-07-25 11:48:30.823827292 +0200
+++ driver/xf86-input-palmax/configure.ac 2005-07-25 11:50:35.823013830 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-penmount/configure.ac driver/xf86-input-penmount/configure.ac
--- driver.orig/xf86-input-penmount/configure.ac 2005-07-25 11:48:31.136772682 +0200
+++ driver/xf86-input-penmount/configure.ac 2005-07-25 11:50:35.837011387 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-sample/configure.ac driver/xf86-input-sample/configure.ac
--- driver.orig/xf86-input-sample/configure.ac 2005-07-25 11:48:30.882816998 +0200
+++ driver/xf86-input-sample/configure.ac 2005-07-25 11:50:35.929995160 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-spaceorb/configure.ac driver/xf86-input-spaceorb/configure.ac
--- driver.orig/xf86-input-spaceorb/configure.ac 2005-07-25 11:48:32.873469621 +0200
+++ driver/xf86-input-spaceorb/configure.ac 2005-07-25 11:50:35.946992194 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-summa/configure.ac driver/xf86-input-summa/configure.ac
--- driver.orig/xf86-input-summa/configure.ac 2005-07-25 11:48:28.383253182 +0200
+++ driver/xf86-input-summa/configure.ac 2005-07-25 11:50:35.961989577 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-tek4957/configure.ac driver/xf86-input-tek4957/configure.ac
--- driver.orig/xf86-input-tek4957/configure.ac 2005-07-25 11:48:35.104080370 +0200
+++ driver/xf86-input-tek4957/configure.ac 2005-07-25 11:50:35.986985215 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-ur98/configure.ac driver/xf86-input-ur98/configure.ac
--- driver.orig/xf86-input-ur98/configure.ac 2005-07-25 11:48:33.101429841 +0200
+++ driver/xf86-input-ur98/configure.ac 2005-07-25 11:50:36.004982074 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-input-void/configure.ac driver/xf86-input-void/configure.ac
--- driver.orig/xf86-input-void/configure.ac 2005-07-25 11:48:33.172417453 +0200
+++ driver/xf86-input-void/configure.ac 2005-07-25 11:50:36.019979457 +0200
@@ -74,7 +74,9 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
# Checks for libraries.
diff -u -r driver.orig/xf86-video-chips/configure.ac driver/xf86-video-chips/configure.ac
--- driver.orig/xf86-video-chips/configure.ac 2005-07-26 11:23:54.066590260 +0200
+++ driver/xf86-video-chips/configure.ac 2005-07-26 11:30:32.101007929 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-cirrus/configure.ac driver/xf86-video-cirrus/configure.ac
--- driver.orig/xf86-video-cirrus/configure.ac 2005-07-26 11:23:50.000000000 +0200
+++ driver/xf86-video-cirrus/configure.ac 2005-07-26 11:30:39.413728334 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-cyrix/configure.ac driver/xf86-video-cyrix/configure.ac
--- driver.orig/xf86-video-cyrix/configure.ac 2005-07-26 11:23:54.130579074 +0200
+++ driver/xf86-video-cyrix/configure.ac 2005-07-26 11:30:45.642638389 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-fbdev/configure.ac driver/xf86-video-fbdev/configure.ac
--- driver.orig/xf86-video-fbdev/configure.ac 2005-07-26 11:23:54.252557752 +0200
+++ driver/xf86-video-fbdev/configure.ac 2005-07-26 11:30:56.854676492 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-i128/configure.ac driver/xf86-video-i128/configure.ac
--- driver.orig/xf86-video-i128/configure.ac 2005-07-26 11:23:52.450872700 +0200
+++ driver/xf86-video-i128/configure.ac 2005-07-26 11:31:02.983604047 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-i740/configure.ac driver/xf86-video-i740/configure.ac
--- driver.orig/xf86-video-i740/configure.ac 2005-07-26 11:23:52.514861514 +0200
+++ driver/xf86-video-i740/configure.ac 2005-07-26 11:31:10.523284750 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-imstt/configure.ac driver/xf86-video-imstt/configure.ac
--- driver.orig/xf86-video-imstt/configure.ac 2005-07-26 11:23:54.466520349 +0200
+++ driver/xf86-video-imstt/configure.ac 2005-07-26 11:31:16.691205486 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-neomagic/configure.ac driver/xf86-video-neomagic/configure.ac
--- driver.orig/xf86-video-neomagic/configure.ac 2005-07-26 22:39:19.583051320 +0200
+++ driver/xf86-video-neomagic/configure.ac 2005-07-26 22:40:44.319594890 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-newport/configure.ac driver/xf86-video-newport/configure.ac
--- driver.orig/xf86-video-newport/configure.ac 2005-07-26 22:39:21.664721079 +0200
+++ driver/xf86-video-newport/configure.ac 2005-07-26 22:40:52.410308606 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-nsc/configure.ac driver/xf86-video-nsc/configure.ac
--- driver.orig/xf86-video-nsc/configure.ac 2005-07-26 22:39:20.809856699 +0200
+++ driver/xf86-video-nsc/configure.ac 2005-07-26 22:41:00.259060549 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-nv/configure.ac driver/xf86-video-nv/configure.ac
--- driver.orig/xf86-video-nv/configure.ac 2005-07-26 22:39:19.823013253 +0200
+++ driver/xf86-video-nv/configure.ac 2005-07-26 22:41:06.753027743 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-rendition/configure.ac driver/xf86-video-rendition/configure.ac
--- driver.orig/xf86-video-rendition/configure.ac 2005-07-26 22:39:19.643041803 +0200
+++ driver/xf86-video-rendition/configure.ac 2005-07-26 22:41:21.367702822 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-s3/configure.ac driver/xf86-video-s3/configure.ac
--- driver.orig/xf86-video-s3/configure.ac 2005-07-26 22:39:19.760023245 +0200
+++ driver/xf86-video-s3/configure.ac 2005-07-26 22:41:29.957335993 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-s3virge/configure.ac driver/xf86-video-s3virge/configure.ac
--- driver.orig/xf86-video-s3virge/configure.ac 2005-07-26 22:39:18.177274325 +0200
+++ driver/xf86-video-s3virge/configure.ac 2005-07-26 22:41:36.271331096 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
AC_OUTPUT([
diff -u -r driver.orig/xf86-video-glint/configure.ac driver/xf86-video-glint/configure.ac
--- driver.orig/xf86-video-glint/configure.ac 2005-07-30 09:40:07.255841374 +0200
+++ driver/xf86-video-glint/configure.ac 2005-07-30 09:56:02.738729826 +0200
@@ -54,6 +54,11 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
@@ -88,7 +93,6 @@
fi
AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-glint: configure.ac.orig
Only in driver/xf86-video-glint: configure.ac.rej
diff -u -r driver.orig/xf86-video-neomagic/configure.ac driver/xf86-video-neomagic/configure.ac
Only in driver/xf86-video-neomagic: configure.ac.orig
diff -u -r driver.orig/xf86-video-newport/configure.ac driver/xf86-video-newport/configure.ac
Only in driver/xf86-video-newport: configure.ac.orig
diff -u -r driver.orig/xf86-video-nsc/configure.ac driver/xf86-video-nsc/configure.ac
Only in driver/xf86-video-nsc: configure.ac.orig
diff -u -r driver.orig/xf86-video-nv/configure.ac driver/xf86-video-nv/configure.ac
Only in driver/xf86-video-nv: configure.ac.orig
diff -u -r driver.orig/xf86-video-rendition/configure.ac driver/xf86-video-rendition/configure.ac
Only in driver/xf86-video-rendition: configure.ac.orig
diff -u -r driver.orig/xf86-video-s3/configure.ac driver/xf86-video-s3/configure.ac
Only in driver/xf86-video-s3: configure.ac.orig
diff -u -r driver.orig/xf86-video-s3virge/configure.ac driver/xf86-video-s3virge/configure.ac
Only in driver/xf86-video-s3virge: configure.ac.orig
diff -u -r driver.orig/xf86-video-savage/configure.ac driver/xf86-video-savage/configure.ac
--- driver.orig/xf86-video-savage/configure.ac 2005-07-30 09:40:03.832440250 +0200
+++ driver/xf86-video-savage/configure.ac 2005-07-30 09:50:13.443813785 +0200
@@ -54,6 +54,11 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
@@ -88,7 +93,6 @@
fi
AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
diff -u -r driver.orig/xf86-video-siliconmotion/configure.ac driver/xf86-video-siliconmotion/configure.ac
--- driver.orig/xf86-video-siliconmotion/configure.ac 2005-07-30 09:40:05.817093063 +0200
+++ driver/xf86-video-siliconmotion/configure.ac 2005-07-30 09:51:15.242006480 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-siliconmotion: configure.ac.orig
diff -u -r driver.orig/xf86-video-sis/configure.ac driver/xf86-video-sis/configure.ac
--- driver.orig/xf86-video-sis/configure.ac 2005-07-30 09:40:06.492974827 +0200
+++ driver/xf86-video-sis/configure.ac 2005-07-30 09:52:05.536211221 +0200
@@ -54,6 +54,11 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
@@ -88,7 +93,6 @@
fi
AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
diff -u -r driver.orig/xf86-video-sisusb/configure.ac driver/xf86-video-sisusb/configure.ac
--- driver.orig/xf86-video-sisusb/configure.ac 2005-07-30 09:40:03.969416288 +0200
+++ driver/xf86-video-sisusb/configure.ac 2005-07-30 09:55:26.750025675 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto panoramixproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-sisusb: configure.ac.orig
diff -u -r driver.orig/xf86-video-tdfx/configure.ac driver/xf86-video-tdfx/configure.ac
--- driver.orig/xf86-video-tdfx/configure.ac 2005-07-30 09:40:05.577135040 +0200
+++ driver/xf86-video-tdfx/configure.ac 2005-07-30 09:53:08.572188003 +0200
@@ -54,6 +54,11 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
@@ -88,7 +93,6 @@
fi
AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
diff -u -r driver.orig/xf86-video-trident/configure.ac driver/xf86-video-trident/configure.ac
--- driver.orig/xf86-video-trident/configure.ac 2005-07-30 09:40:03.049577201 +0200
+++ driver/xf86-video-trident/configure.ac 2005-07-30 09:53:50.696821758 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-trident: configure.ac.orig
diff -u -r driver.orig/xf86-video-tseng/configure.ac driver/xf86-video-tseng/configure.ac
--- driver.orig/xf86-video-tseng/configure.ac 2005-07-30 09:40:07.445808142 +0200
+++ driver/xf86-video-tseng/configure.ac 2005-07-30 09:53:59.726242821 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-tseng: configure.ac.orig
diff -u -r driver.orig/xf86-video-vga/configure.ac driver/xf86-video-vga/configure.ac
--- driver.orig/xf86-video-vga/configure.ac 2005-07-30 09:40:06.621952264 +0200
+++ driver/xf86-video-vga/configure.ac 2005-07-30 09:54:09.172590988 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-vga: configure.ac.orig
diff -u -r driver.orig/xf86-video-via/configure.ac driver/xf86-video-via/configure.ac
--- driver.orig/xf86-video-via/configure.ac 2005-07-30 09:40:06.685941070 +0200
+++ driver/xf86-video-via/configure.ac 2005-07-30 09:54:37.957557551 +0200
@@ -54,6 +54,11 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
@@ -88,7 +93,6 @@
fi
AC_SUBST([DRI_CFLAGS])
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
diff -u -r driver.orig/xf86-video-vmware/configure.ac driver/xf86-video-vmware/configure.ac
--- driver.orig/xf86-video-vmware/configure.ac 2005-07-30 09:40:04.423336881 +0200
+++ driver/xf86-video-vmware/configure.ac 2005-07-30 09:55:09.539035178 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-vmware: configure.ac.orig
diff -u -r driver.orig/xf86-video-voodoo/configure.ac driver/xf86-video-voodoo/configure.ac
--- driver.orig/xf86-video-voodoo/configure.ac 2005-07-30 09:40:04.490325162 +0200
+++ driver/xf86-video-voodoo/configure.ac 2005-07-30 09:55:17.057720462 +0200
@@ -49,12 +49,16 @@
PKG_CHECK_MODULES(XORG, [xorg-server xproto])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+CFLAGS="$XORG_CFLAGS"
+INCLUDES="$XORG_INCS -I${sdkdir}"
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
# Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
-AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
XORG_RELEASE_VERSION
Only in driver/xf86-video-voodoo: configure.ac.orig
More information about the xorg-modular
mailing list