summaryrefslogtreecommitdiff
path: root/source/x/x11/configure
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11/configure')
-rw-r--r--source/x/x11/configure/compiz2
-rw-r--r--source/x/x11/configure/libXaw3d16
-rw-r--r--source/x/x11/configure/xf86-video-ati21
-rw-r--r--source/x/x11/configure/xorg-server5
4 files changed, 20 insertions, 24 deletions
diff --git a/source/x/x11/configure/compiz b/source/x/x11/configure/compiz
index aebd49a2..8a960f3d 100644
--- a/source/x/x11/configure/compiz
+++ b/source/x/x11/configure/compiz
@@ -11,6 +11,6 @@ CXXFLAGS=$SLKCFLAGS \
--disable-static \
--disable-gconf \
--disable-kde \
- --enable-kde4 \
+ --disable-kde4 \
--enable-librsvg \
--build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/libXaw3d b/source/x/x11/configure/libXaw3d
new file mode 100644
index 00000000..0d802fa3
--- /dev/null
+++ b/source/x/x11/configure/libXaw3d
@@ -0,0 +1,16 @@
+CFLAGS=$SLKCFLAGS \
+CXXFLAGS=$SLKCFLAGS \
+./configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --infodir=/usr/info \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/${PKGNAME}-${MODULAR_PACKAGE_VERSION} \
+ --disable-static \
+ --enable-multiplane-bitmaps \
+ --enable-gray-stipples \
+ --enable-arrow-scrollbars \
+ --enable-internationalization \
+ --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xf86-video-ati b/source/x/x11/configure/xf86-video-ati
deleted file mode 100644
index 0eacb0c3..00000000
--- a/source/x/x11/configure/xf86-video-ati
+++ /dev/null
@@ -1,21 +0,0 @@
-xserver_source="/tmp/x11-build/xorg-server-1.9.3"
-
-# Let these just fail to build. In any case, an "exit 1"
-# here is just plain wrong.
-#if [ ! -d "$xserver_source" ]; then
-# echo "$xserver_source does not exist, and you need it."
-# exit 1
-#fi
-
-CFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-CXXFLAGS="$SLKCFLAGS -I${xserver_source}/hw/xfree86/ramdac" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --infodir=/usr/info \
- --mandir=/usr/man \
- --disable-static \
- --with-xserver-source=${xserver_source} \
- --build=$ARCH-slackware-linux
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index cf9bd843..778d7668 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -27,14 +27,15 @@ CFLAGS="$SLKCFLAGS" \
--with-int10=x86emu \
--with-default-font-path="${DEF_FONTPATH}" \
--with-module-dir=/usr/lib${LIBDIRSUFFIX}/xorg/modules \
- --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri \
- --with-os-name="Slackware 13.37" \
+ --with-os-name="Slackware 14.0" \
--with-os-vendor="Slackware Linux Project" \
--with-xkb-path=/etc/X11/xkb \
--with-xkb-output=/var/lib/xkb \
$BUILD_SERVERS \
--build=$ARCH-slackware-linux
+# --with-dri-driver-path=/usr/lib${LIBDIRSUFFIX}/xorg/modules/dri
+
if [ "$ARCH" = "x86_64" ]; then
# To prevent the error "No rule to make target `-ldl'"
sed -i -e 's#-ldl##' hw/xfree86/Makefile