diff options
| author | Timo Aaltonen <tjaalton@pris.hut.fi> | 2008-07-04 11:17:55 +0300 |
|---|---|---|
| committer | Timo Aaltonen <tjaalton@pris.hut.fi> | 2008-07-04 11:50:09 +0300 |
| commit | 0261355a03315c23d8be903403877e6870601ce7 (patch) | |
| tree | 9cf688f9cebf8202185fa5ccd5c84799c5adbbfe /debian | |
| parent | beb8547c712a8be30484658843fed5e9e2d4cc49 (diff) | |
Fix confflags CFLAGS and clean up confflags-dri.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/rules | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules index b44468138af..d1efb8dbf75 100755 --- a/debian/rules +++ b/debian/rules @@ -57,9 +57,8 @@ confflags-common = --disable-glu --disable-glut --disable-glw \ confflags-dri = --with-demos=xdemos \ --libdir=/usr/lib/glx \ --with-dri-driverdir=/usr/lib/dri \ - --disable-glu --disable-glut --disable-glw \ --enable-glx-tls \ - CFLAGS="$(CFLAGS)" + $(confflags-common) confflags-osmesa = --with-driver=osmesa \ --with-demos= \ @@ -90,12 +89,14 @@ confflags-osmesa32-static = --with-driver=osmesa --with-osmesa-bits=32 \ confflags-swx11+glu = --with-driver=xlib \ --with-demos= \ - --disable-glut + --disable-glut \ + CFLAGS="$(CFLAGS)" confflags-swx11+glu-static = --with-driver=xlib \ --enable-static \ --with-demos= \ - --disable-glut + --disable-glut \ + CFLAGS="$(CFLAGS)" confflags-swx11+glu-i386-i686 = --with-driver=xlib \ --with-demos= \ |