Branch: master

573c5108 2014-04-28 19:13:43 Slávek Banko
Update tdebase build options on Debian and Ubuntu
This relates to Bug 2028
M debian/lenny/tdebase/debian/rules
M debian/squeeze/tdebase/debian/rules
M ubuntu/maverick/tdebase/debian/rules
diff --git a/debian/lenny/tdebase/debian/rules b/debian/lenny/tdebase/debian/rules
index 438101c..2a76298 100755
--- a/debian/lenny/tdebase/debian/rules
+++ b/debian/lenny/tdebase/debian/rules
@@ -56,14 +56,13 @@
  -DWITH_TDEHWLIB="ON" \
  -DWITH_XDMCP="ON" \
  -DWITH_XRENDER="ON" \
- -DWITH_XDAMAGE="ON" \
- -DWITH_XEXT="ON" \
  -DWITH_XTEST="ON" \
  -DWITH_OPENGL="ON" \
  -DWITH_XSCREENSAVER="ON" \
  -DWITH_UPOWER="ON" \
  -DWITH_LIBART="ON" \
- -DWITH_LIBCONFIG="ON"
+ -DWITH_LIBCONFIG="ON" \
+ -DWITH_PCRE="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/debian/squeeze/tdebase/debian/rules b/debian/squeeze/tdebase/debian/rules
index 100951a..5a84561 100755
--- a/debian/squeeze/tdebase/debian/rules
+++ b/debian/squeeze/tdebase/debian/rules
@@ -56,14 +56,13 @@
  -DWITH_TDEHWLIB="ON" \
  -DWITH_XDMCP="ON" \
  -DWITH_XRENDER="ON" \
- -DWITH_XDAMAGE="ON" \
- -DWITH_XEXT="ON" \
  -DWITH_XTEST="ON" \
  -DWITH_OPENGL="ON" \
  -DWITH_XSCREENSAVER="ON" \
  -DWITH_UPOWER="ON" \
  -DWITH_LIBART="ON" \
- -DWITH_LIBCONFIG="ON"
+ -DWITH_LIBCONFIG="ON" \
+ -DWITH_PCRE="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules
index 1a2689f..1d062ca 100755
--- a/ubuntu/maverick/tdebase/debian/rules
+++ b/ubuntu/maverick/tdebase/debian/rules
@@ -56,14 +56,13 @@
  -DWITH_TDEHWLIB="ON" \
  -DWITH_XDMCP="ON" \
  -DWITH_XRENDER="ON" \
- -DWITH_XDAMAGE="ON" \
- -DWITH_XEXT="ON" \
  -DWITH_XTEST="ON" \
  -DWITH_OPENGL="ON" \
  -DWITH_XSCREENSAVER="ON" \
  -DWITH_UPOWER="ON" \
  -DWITH_LIBART="ON" \
- -DWITH_LIBCONFIG="ON"
+ -DWITH_LIBCONFIG="ON" \
+ -DWITH_PCRE="ON"
 
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.