[svn] gpg-error - r239 - trunk

[svn author wk]

Author: wk
Date: 2010-04-14 16:32:07 +0200 (Wed, 14 Apr 2010)
New Revision: 239

Modified:
   trunk/autogen.sh
Log:
Updated.


Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2010-04-14 10:57:58 UTC (rev 238)
+++ trunk/autogen.sh	2010-04-14 14:32:07 UTC (rev 239)
@@ -35,6 +35,24 @@
   shift
 fi
 
+# Begin list of optional variables sourced from ~/.gnupg-autogen.rc
+w32_toolprefixes=
+w32_extraoptions=
+w32ce_toolprefixes=
+w32ce_extraoptions=
+amd64_toolprefixes=
+# End list of optional variables sourced from ~/.gnupg-autogen.rc
+# What follows are variables which are sourced but default to 
+# environment variables or lacking them hardcoded values.
+#w32root=
+#w32ce_root=
+#amd64root=
+
+if [ -f "$HOME/.gnupg-autogen.rc" ]; then
+    echo "sourcing extra definitions from $HOME/.gnupg-autogen.rc"
+    . "$HOME/.gnupg-autogen.rc"
+fi
+
 # Convenience option to use certain configure options for some hosts.
 myhost="" 
 myhostsub=""
@@ -46,8 +64,12 @@
         myhost="w32"
         myhostsub="ce"
         ;;
+    --build*)
+        echo "**Error**: invalid build option $1" >&2
+        exit 1
+        ;;
     *)
-     ;;
+        ;;
 esac
 
 
@@ -66,6 +88,7 @@
 
     case $myhostsub in
         ce)
+          w32root="$w32ce_root"
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="arm-mingw32ce"
           ;;