Tweaks

2 files changed, 4 insertions, 3 deletions

diff --git a/jhbuildrc b/jhbuildrc
index 09dbbdc..284b738 100644
--- a/jhbuildrc
+++ b/jhbuildrc
@@ -104,9 +104,10 @@ os.environ['JHBUILD_PREFIX'] = prefix
 
 autogenargs = '--cache-file=/jhbuild/configure-cache'
 
-module_autogenargs['xserver'] = autogenargs + ' --enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin --disable-glx-tls --enable-windowswm --enable-xf86bigfont'
+module_autogenargs['xserver'] = ' --enable-xvfb --enable-xnest --enable-dmx --enable-kdrive --enable-xephyr --enable-xfake --disable-xfbdev --enable-xorg --enable-xwin --disable-glx-tls --enable-windowswm --enable-xf86bigfont'
 module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --enable-debug'
 module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' --with-builderstring="Tag: `cd ' + checkoutroot + '/xorg/xserver ; git describe | tr -d \\n`"'
+module_autogenargs['xserver'] = module_autogenargs['xserver'] + ' CFLAGS="-Wno-error=implicit-function-declaration ' + os.environ['CFLAGS'] + '"'
 # we can only build the Xwin DDX when rootless is enabled, as it turns on horrible ROOTLESS hacks in DIX
 #  --enable-dmx --enable-xephyr --enable-xfake
 
diff --git a/xorg.modules b/xorg.modules
index bdf641f..3b33289 100755..100644
--- a/xorg.modules
+++ b/xorg.modules
@@ -3,8 +3,8 @@
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 
 <moduleset>
-  <include href="/jhbuild/checkout/xorg/util/modular/xorg.modules" />
-  <!-- <include href="http://cgit.freedesktop.org/xorg/util/modular/plain/xorg.modules" /> -->
+  <!-- include href="/jhbuild/checkout/xorg/util/modular/xorg.modules" /> -->
+  <include href="http://cgit.freedesktop.org/xorg/util/modular/plain/xorg.modules" />
 
   <repository type="git" name="jturney" href="git://people.freedesktop.org/~jturney/"/>
   <repository type="git" name="git.freedesktop.org" href="git://anongit.freedesktop.org/git/"/>