New commits:
commit 20f784b99de2432806eaf5601f67cc3787eeddde
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
sane-backends: back to upstream: choose local drivers or only network
Building all local drivers is default now, as it has been before
(meaning: my scanner _works_ by default!).
diff --git a/graphics-libs/sane-backends/BUILD
b/graphics-libs/sane-backends/BUILD
index 72da8cc..4deb843 100755
--- a/graphics-libs/sane-backends/BUILD
+++ b/graphics-libs/sane-backends/BUILD
@@ -18,10 +18,8 @@ if [[ $HP5400NVSM == y ]]; then
' >> $SOURCE_DIRECTORY/backend/hp5400_internal.h
fi &&
-if [[ $SANE_LOCAL == none ]]; then
+if [[ "$SANE_BUILD_LOCAL" == n ]]; then
OPTS="$OPTS --disable-local-backends"
-else
- export BACKENDS=$SANE_LOCAL
fi &&
-config_query_multi SANE_LOCAL "which local scanners?" \
-none abaton agfafocus apple artec as6e avision bh canon canon630u coolscan \
-coolscan2 dc25 dmc epson fujitsu genesys gt68xx hp leo lexmark matsushita \
-microtek microtek2 mustek mustek_usb nec net pie pixma plustek plustek_pp \
-ricoh s9036 sceptre sharp sp15c st400 tamarack test teco1 teco2 teco3 umax \
-umax_pp umax1220u artec_eplus48u ma1509 ibm hp5400 u12 snapscan niash sm3840
\
-hp4200 sm3600 hp3500 stv680 canon_pp cardscan dc210 dc240 &&
+# Honor the legacy decision for SANE_LOCAL
+local local_default=y &&
+if [[ "$SANE_LOCAL" == none ]]; then
+ local_default=n
+fi &&
+
+config_query SANE_BUILD_LOCAL "Build local drivers (for connecting a scanner
to _this_ box)?" $local_default &&
config_query USEFORK "Use fork instead of pthread?" y &&
config_query IPV6 "Enable IPV6 support?" y &&
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index 35f8dd3..e5371c8 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,8 @@
+2008-09-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, BUILD: Remove the massive list of backends for the
+ simple question of local drivers or not.
+ The detailed backend choice is not "official" by upstream anyway.
+
2008-03-24 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: yet more sanei*.h files
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (5f3c59333e089c719975529719284d6fc171af15),
Thomas Orgis, 09/07/2008