diff --git a/gramps2/Makefile.in b/gramps2/Makefile.in
index 22dd673f3..df565ac0c 100644
--- a/gramps2/Makefile.in
+++ b/gramps2/Makefile.in
@@ -73,18 +73,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/configure b/gramps2/configure
index 17cf195d6..a4ef95c19 100755
--- a/gramps2/configure
+++ b/gramps2/configure
@@ -3852,6 +3852,11 @@ try:
     pygtk.require('2.0')
 except ImportError:
     pass
+
+def out(str):
+    f = open('conftest.out', 'w')
+    f.write(str)
+    f.close()
 "
 
 
@@ -3861,18 +3866,14 @@ cat > conftest.py <<EOF
 $pygtk_require
 try:
     import gobject
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("No")
 EOF
 $PYTHON conftest.py
 has_pygtk=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_pygtk
+if test YES != "$has_pygtk"
 then
    { { echo "$as_me:$LINENO: error:
 
@@ -3890,19 +3891,19 @@ echo $ECHO_N "checking Python bindings for GNOME... $ECHO_C" >&6
 cat > conftest.py <<EOF
 $pygtk_require
 try:
-    import gnome, gnome.ui
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    import gnome
+    # Do not import gnome.ui, this can kill python if the
+    # display cannot be opened.  Just search it.
+    import imp
+    imp.find_module('gnome/ui')
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_pygnome=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_pygnome
+if test YES != "$has_pygnome"
 then
    { { echo "$as_me:$LINENO: error:
 **** The python bindings for GNOME 2.0 (gnome-python2) could not be found." >&5
@@ -3919,18 +3920,14 @@ cat > conftest.py <<EOF
 $pygtk_require
 try:
     import gconf
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_gconf=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_gconf
+if test YES != "$has_gconf"
 then
    { { echo "$as_me:$LINENO: error:
 **** The python bindings for gconf (gnome-python2-gconf) could not be found." >&5
@@ -3946,19 +3943,18 @@ echo $ECHO_N "checking Python bindings for GNOME canvas... $ECHO_C" >&6
 cat > conftest.py <<EOF
 $pygtk_require
 try:
-    import gnome.canvas
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    # Do not import gnome.canvas, this can raise a RuntimeError if the
+    # display cannot be opened.  Just search it.
+    import imp
+    imp.find_module('gnome/canvas')
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_canvas=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_canvas
+if test YES != "$has_canvas"
 then
    { { echo "$as_me:$LINENO: error:
 **** The python bindings for GNOME canvas (gnome-python2-canvas) could not be found." >&5
@@ -3974,19 +3970,18 @@ echo $ECHO_N "checking Python bindin for glade... $ECHO_C" >&6
 cat > conftest.py <<EOF
 $pygtk_require
 try:
-    import gtk.glade
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    # Do not import gtk.glade, this can raise a RuntimeError if the
+    # display cannot be opened.  Just search it.
+    import imp
+    imp.find_module('gtk/glade')
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_pygtk=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_pygtk
+if test YES != "$has_pygtk"
 then
    { { echo "$as_me:$LINENO: error:
 
diff --git a/gramps2/configure.in b/gramps2/configure.in
index dbb94e39c..9040590a4 100644
--- a/gramps2/configure.in
+++ b/gramps2/configure.in
@@ -75,6 +75,11 @@ try:
     pygtk.require('2.0')
 except ImportError:
     pass
+
+def out(str):
+    f = open('conftest.out', 'w')
+    f.write(str)
+    f.close()
 "
 
 dnl Check if python bindings for gtk are installed
@@ -84,18 +89,14 @@ cat > conftest.py <<EOF
 $pygtk_require
 try:
     import gobject
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("No")
 EOF
 $PYTHON conftest.py
 has_pygtk=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_pygtk
+if test YES != "$has_pygtk"
 then
    AC_MSG_ERROR([
 
@@ -107,19 +108,19 @@ AC_MSG_CHECKING(Python bindings for GNOME)
 cat > conftest.py <<EOF
 $pygtk_require
 try:
-    import gnome, gnome.ui
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    import gnome
+    # Do not import gnome.ui, this can kill python if the
+    # display cannot be opened.  Just search it.
+    import imp
+    imp.find_module('gnome/ui')
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_pygnome=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_pygnome
+if test YES != "$has_pygnome"
 then
    AC_MSG_ERROR([
 **** The python bindings for GNOME 2.0 (gnome-python2) could not be found.])
@@ -131,18 +132,14 @@ cat > conftest.py <<EOF
 $pygtk_require
 try:
     import gconf
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_gconf=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_gconf
+if test YES != "$has_gconf"
 then
    AC_MSG_ERROR([
 **** The python bindings for gconf (gnome-python2-gconf) could not be found.])
@@ -153,19 +150,18 @@ AC_MSG_CHECKING(Python bindings for GNOME canvas)
 cat > conftest.py <<EOF
 $pygtk_require
 try:
-    import gnome.canvas
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    # Do not import gnome.canvas, this can raise a RuntimeError if the
+    # display cannot be opened.  Just search it.
+    import imp
+    imp.find_module('gnome/canvas')
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_canvas=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_canvas
+if test YES != "$has_canvas"
 then
    AC_MSG_ERROR([
 **** The python bindings for GNOME canvas (gnome-python2-canvas) could not be found.])
@@ -176,19 +172,18 @@ AC_MSG_CHECKING(Python bindin for glade)
 cat > conftest.py <<EOF
 $pygtk_require
 try:
-    import gtk.glade
-    f = open("conftest.out", "w")
-    f.write("YES")
-    f.close()
+    # Do not import gtk.glade, this can raise a RuntimeError if the
+    # display cannot be opened.  Just search it.
+    import imp
+    imp.find_module('gtk/glade')
+    out("YES")
 except ImportError:
-    f = open("conftest.out", "w")
-    f.write("NO")
-    f.close()
+    out("NO")
 EOF
 $PYTHON conftest.py
 has_pygtk=`cat conftest.out`
 rm -f conftest.out conftest.py
-if test "YES" != $has_pygtk
+if test YES != "$has_pygtk"
 then
    AC_MSG_ERROR([
 
diff --git a/gramps2/doc/Makefile.in b/gramps2/doc/Makefile.in
index e3ff9fd32..8c2d729e5 100644
--- a/gramps2/doc/Makefile.in
+++ b/gramps2/doc/Makefile.in
@@ -73,18 +73,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/doc/gramps-manual/C/Makefile.in b/gramps2/doc/gramps-manual/C/Makefile.in
index 905ef9ed1..f91f36287 100644
--- a/gramps2/doc/gramps-manual/C/Makefile.in
+++ b/gramps2/doc/gramps-manual/C/Makefile.in
@@ -133,18 +133,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/doc/gramps-manual/Makefile.in b/gramps2/doc/gramps-manual/Makefile.in
index 5b78ecbd9..1ddcad2d9 100644
--- a/gramps2/doc/gramps-manual/Makefile.in
+++ b/gramps2/doc/gramps-manual/Makefile.in
@@ -73,18 +73,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/example/Makefile.in b/gramps2/example/Makefile.in
index 162a3d45a..4fe40653e 100644
--- a/gramps2/example/Makefile.in
+++ b/gramps2/example/Makefile.in
@@ -71,18 +71,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/example/gramps/Makefile.in b/gramps2/example/gramps/Makefile.in
index 54b08e0b3..b3187b9aa 100644
--- a/gramps2/example/gramps/Makefile.in
+++ b/gramps2/example/gramps/Makefile.in
@@ -72,18 +72,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec
index 511e595dc..572793959 100644
--- a/gramps2/gramps.spec
+++ b/gramps2/gramps.spec
@@ -1,5 +1,5 @@
 %define ver      0.9.3
-%define rel      0.CVS20030810
+%define rel      0.CVS20030813
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in
index deb068067..c74d431df 100644
--- a/gramps2/src/Makefile.in
+++ b/gramps2/src/Makefile.in
@@ -71,18 +71,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = intl22.so
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/src/calendars/Makefile.in b/gramps2/src/calendars/Makefile.in
index b1b2472ac..521da9548 100644
--- a/gramps2/src/calendars/Makefile.in
+++ b/gramps2/src/calendars/Makefile.in
@@ -76,18 +76,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in
index d3ead583d..58ba8b925 100644
--- a/gramps2/src/data/Makefile.in
+++ b/gramps2/src/data/Makefile.in
@@ -71,18 +71,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/src/data/templates/Makefile.in b/gramps2/src/data/templates/Makefile.in
index 4fb596f7c..dc7ee294f 100644
--- a/gramps2/src/data/templates/Makefile.in
+++ b/gramps2/src/data/templates/Makefile.in
@@ -72,18 +72,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/src/docgen/Makefile.in b/gramps2/src/docgen/Makefile.in
index 893e11a74..818cfa671 100644
--- a/gramps2/src/docgen/Makefile.in
+++ b/gramps2/src/docgen/Makefile.in
@@ -75,18 +75,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/src/filters/Makefile.in b/gramps2/src/filters/Makefile.in
index d3a56eac0..74a285a6c 100644
--- a/gramps2/src/filters/Makefile.in
+++ b/gramps2/src/filters/Makefile.in
@@ -71,18 +71,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@
diff --git a/gramps2/src/plugins/Makefile.in b/gramps2/src/plugins/Makefile.in
index 0a2d4e1ce..7481adcfe 100644
--- a/gramps2/src/plugins/Makefile.in
+++ b/gramps2/src/plugins/Makefile.in
@@ -72,18 +72,13 @@ DEPDIR = @DEPDIR@
 GNOMEHELP = @GNOMEHELP@
 GNOMEINC = @GNOMEINC@
 GNOMELIB = @GNOMELIB@
-GPREF = @GPREF@
 GPREFIX = @GPREFIX@
 HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
 LANGUAGES = @LANGUAGES@
-LIBS = @LIBS@
 MOFILES = @MOFILES@
 MSGFMT = @MSGFMT@
-P15_INCLUDES = @P15_INCLUDES@
-P20_INCLUDES = @P20_INCLUDES@
-P21_INCLUDES = @P21_INCLUDES@
 P22_INCLUDES = @P22_INCLUDES@
 PACKAGE = @PACKAGE@
 POFILES = @POFILES@