[svn] gcry - r1428 - trunk

[svn author wk]

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

Modified:
   trunk/autogen.sh
Log:
Updated


Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2010-04-12 21:00:13 UTC (rev 1427)
+++ trunk/autogen.sh	2010-04-14 14:32:53 UTC (rev 1428)
@@ -36,6 +36,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=""
@@ -50,8 +68,12 @@
     --build-amd64)
         myhost="amd64"
         ;;
+    --build*)
+        echo "**Error**: invalid build option $1" >&2
+        exit 1
+        ;;
      *)
-     ;;
+        ;;
 esac
 
 
@@ -69,6 +91,7 @@
 
     case $myhostsub in
         ce)
+          w32root="$w32ce_root"
           [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
           toolprefixes="arm-mingw32ce"
           ;;