>From f86ed33a4280207fef42d1b4cdaf5f9d2b2e1155 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Tue, 23 Mar 2010 16:56:01 +0100
Subject: [PATCH] Remove some dead weight from configure.ac and debian/rules
---
configure.ac | 33 ---------------------------------
debian/README.build | 1 -
debian/rules | 3 +--
3 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/configure.ac b/configure.ac
index db019b7..a2b1ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,13 +256,6 @@ if test "$LINGUAS" != ""; then
if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then
AC_DEFINE(I18N, 1, [Internationalization (I18N) support (set by
configure)])
PO=""
-# if test "$LINGUAS" = ""; then
-# ling=` (cd src/po; /bin/ls *.po) `
-# for l in $ling; do
-# lcode=`basename $l .po`
-# LINGUAS="$LINGUAS $lcode"
-# done
-# fi
echo "xgettext and gettext() exist; will build i18n support for
$LINGUAS"
else
LINGUAS=""
@@ -875,31 +868,6 @@ fi
)
-dnl
-dnl Nicolai: Program tests for Documentation Section
-dnl =================================================
-dnl DOCTYPES=""
-dnl AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, ,$PATH)
-dnl if test "x$MAKEINFO" != "x" ; then
-dnl DOCTYPES="$DOCTYPES info_doc"
-dnl fi
-dnl AC_CHECK_PROG(TEX, tex, tex, ,$PATH)
-dnl if test "x$TEX" != "x" ; then
-dnl DOCTYPES="$DOCTYPES dvi_doc"
-dnl fi
-dnl AC_CHECK_PROG(DVIPS, dvips, dvips, ,$PATH)
-dnl if test "x$DVIPS" != "x" ; then
-dnl DOCTYPES="$DOCTYPES ps_doc"
-dnl fi
-dnl AC_CHECK_PROG(PERL, perl, perl, ,$PATH)
-dnl if test "x$PERL" != "x" ; then
-dnl DOCTYPES="$DOCTYPES html_doc"
-dnl fi
-dnl AC_PATH_PROG(PERL_PATH, perl, perl, ,$PATH)
-dnl AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ,$PATH)
-
-dnl AC_SUBST(DOCTYPES)
-
AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile test/Makefile \
WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \
WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \
@@ -1101,7 +1069,6 @@ echo "Use assembly routines for wrlib : $asm_support"
echo "Use inline MMX(tm) x86 assembly : $mmx_support"
echo "Antialiased text support in WINGs : $xft"
echo "Xinerama extension support : $xinerama"
-dnl echo "Virtual desktop support : $vdesktop_on"
echo "Translated message files to install : $mof"
dnl echo "Supported languages beside English : $languages"
if test "x$MOFILES" != "x"; then
diff --git a/debian/README.build b/debian/README.build
index 9265c8d..be5b8f2 100644
--- a/debian/README.build
+++ b/debian/README.build
@@ -61,7 +61,6 @@ Building Window Maker for Debian
XLOCALE := --disable-locale
MODELOCK := --enable-modelock
- VDESKTOP := --enable-vdesktop
XINERAMA := --enable-xinerama
(*) These are not used by default
diff --git a/debian/rules b/debian/rules
index 42b8e4d..c1412b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ LINGUAS := $(patsubst po/%.po, %, $(wildcard
po/*.po))
XLOCALE := --disable-locale
MODELOCK := --enable-modelock
-VDESKTOP := --enable-vdesktop
XINERAMA := --enable-xinerama
# USERMENU := --enable-usermenu
@@ -43,7 +42,7 @@ XINERAMA := --enable-xinerama
# USE_GIF := --disable-gif
# USE_TIFF := --disable-tiff
-WMAKER_OPTIONS := $(XLOCALE) $(MODELOCK) $(VDESKTOP) $(XINERAMA) \
+WMAKER_OPTIONS := $(XLOCALE) $(MODELOCK) $(XINERAMA) \
$(USERMENU) $(SHAPE_EXT) $(USE_SHM) \
$(USE_XPM) $(USE_PNG) $(USE_JPEG) $(USE_GIF) $(USE_TIFF)
--
1.7.0
--
[-]
mkdir /nonexistentFrom f86ed33a4280207fef42d1b4cdaf5f9d2b2e1155 Mon Sep 17 00:00:00 2001
From: Tamas TEVESZ <[email protected]>
Date: Tue, 23 Mar 2010 16:56:01 +0100
Subject: [PATCH] Remove some dead weight from configure.ac and debian/rules
---
configure.ac | 33 ---------------------------------
debian/README.build | 1 -
debian/rules | 3 +--
3 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/configure.ac b/configure.ac
index db019b7..a2b1ccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,13 +256,6 @@ if test "$LINGUAS" != ""; then
if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then
AC_DEFINE(I18N, 1, [Internationalization (I18N) support (set by configure)])
PO=""
-# if test "$LINGUAS" = ""; then
-# ling=` (cd src/po; /bin/ls *.po) `
-# for l in $ling; do
-# lcode=`basename $l .po`
-# LINGUAS="$LINGUAS $lcode"
-# done
-# fi
echo "xgettext and gettext() exist; will build i18n support for $LINGUAS"
else
LINGUAS=""
@@ -875,31 +868,6 @@ fi
)
-dnl
-dnl Nicolai: Program tests for Documentation Section
-dnl =================================================
-dnl DOCTYPES=""
-dnl AC_CHECK_PROG(MAKEINFO, makeinfo, makeinfo, ,$PATH)
-dnl if test "x$MAKEINFO" != "x" ; then
-dnl DOCTYPES="$DOCTYPES info_doc"
-dnl fi
-dnl AC_CHECK_PROG(TEX, tex, tex, ,$PATH)
-dnl if test "x$TEX" != "x" ; then
-dnl DOCTYPES="$DOCTYPES dvi_doc"
-dnl fi
-dnl AC_CHECK_PROG(DVIPS, dvips, dvips, ,$PATH)
-dnl if test "x$DVIPS" != "x" ; then
-dnl DOCTYPES="$DOCTYPES ps_doc"
-dnl fi
-dnl AC_CHECK_PROG(PERL, perl, perl, ,$PATH)
-dnl if test "x$PERL" != "x" ; then
-dnl DOCTYPES="$DOCTYPES html_doc"
-dnl fi
-dnl AC_PATH_PROG(PERL_PATH, perl, perl, ,$PATH)
-dnl AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html, ,$PATH)
-
-dnl AC_SUBST(DOCTYPES)
-
AC_OUTPUT(Makefile po/Makefile util/Makefile util/po/Makefile test/Makefile \
WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \
WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \
@@ -1101,7 +1069,6 @@ echo "Use assembly routines for wrlib : $asm_support"
echo "Use inline MMX(tm) x86 assembly : $mmx_support"
echo "Antialiased text support in WINGs : $xft"
echo "Xinerama extension support : $xinerama"
-dnl echo "Virtual desktop support : $vdesktop_on"
echo "Translated message files to install : $mof"
dnl echo "Supported languages beside English : $languages"
if test "x$MOFILES" != "x"; then
diff --git a/debian/README.build b/debian/README.build
index 9265c8d..be5b8f2 100644
--- a/debian/README.build
+++ b/debian/README.build
@@ -61,7 +61,6 @@ Building Window Maker for Debian
XLOCALE := --disable-locale
MODELOCK := --enable-modelock
- VDESKTOP := --enable-vdesktop
XINERAMA := --enable-xinerama
(*) These are not used by default
diff --git a/debian/rules b/debian/rules
index 42b8e4d..c1412b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
XLOCALE := --disable-locale
MODELOCK := --enable-modelock
-VDESKTOP := --enable-vdesktop
XINERAMA := --enable-xinerama
# USERMENU := --enable-usermenu
@@ -43,7 +42,7 @@ XINERAMA := --enable-xinerama
# USE_GIF := --disable-gif
# USE_TIFF := --disable-tiff
-WMAKER_OPTIONS := $(XLOCALE) $(MODELOCK) $(VDESKTOP) $(XINERAMA) \
+WMAKER_OPTIONS := $(XLOCALE) $(MODELOCK) $(XINERAMA) \
$(USERMENU) $(SHAPE_EXT) $(USE_SHM) \
$(USE_XPM) $(USE_PNG) $(USE_JPEG) $(USE_GIF) $(USE_TIFF)
--
1.7.0
