Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Update extra-version code

  • Loading branch information...
commit 186215fadf10dbc49b669bd1e0cc34886c59d855 1 parent e1c086b
Garrett Holmstrom authored May 11, 2012
1  clc/modules/bootstrap/src/main/native/arguments.ggo.in
@@ -6,6 +6,7 @@ version "@EUCA_VERSION@"
6 6
 section "Bootstrap Configuration"#                                                    #       #                         #                      #      #
7 7
 option "user"                  u   "User to drop privs to after starting."             string  typestr="USERNAME"        default="eucalyptus"    no
8 8
 option "home"                  h   "Eucalyptus home directory."                        string  typestr="DIRECTORY"       default="@prefix@/"     no
  9
+option "extra-version"         -   "Extra version string."                             string  typestr="EXTRAVERSION"    default="@EXTRA_VERSION@" no  hidden
9 10
 
10 11
 option "initialize"            -   "Perform first-time setup.  This is run one time (only!) on the first cloud controller before the first time it is run." flag                              off
11 12
 option "bind-addr"             i   "Specifying this option causes eucalyptus-cloud to only bind the specified local addresses.  The default behaviour is to listen on the any address while determining the user facing local address based on default route and netmask size."  string  typestr="HOSTNAME"                            optional multiple
13  clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.c
@@ -416,6 +416,8 @@ int main(int argc, char *argv[]) {
416 416
 	int i;
417 417
 	if (arguments(argc, argv, args) != 0)
418 418
 		exit(1);
  419
+	if (args->extra_version_orig != NULL)
  420
+		args->extra_version_arg = args->extra_version_orig;
419 421
 	debug = args->debug_flag;
420 422
 	set_output(GETARG(args, out), GETARG(args, err));
421 423
 	if (args->kill_flag == 1)
@@ -764,9 +766,11 @@ int java_init(euca_opts *args, java_home_t *data) {
764 766
 		}
765 767
 	}
766 768
 	JVM_ARG(opt[++x], "-Deuca.version=%1$s", ARGUMENTS_VERSION);
767  
-	JVM_ARG(opt[++x], "-Deuca.extra_version=%1$s", ARGUMENTS_EXTRA_VERSION);
768 769
 	JVM_ARG(opt[++x], "-Deuca.log.level=%1$s", GETARG(args, log_level));
769 770
 	JVM_ARG(opt[++x], "-Deuca.log.appender=%1$s", GETARG(args, log_appender));
  771
+	if (strlen(GETARG(args, extra_version)) > 1 && strncmp(GETARG(args, extra_version), "@", 1)) {
  772
+		JVM_ARG(opt[++x], "-Deuca.extra_version=%1$s", GETARG(args, extra_version));
  773
+	}
770 774
 	if (args->initialize_flag) {
771 775
 		JVM_ARG(opt[++x], "-Deuca.initialize=true");
772 776
 		JVM_ARG(opt[++x], "-Deuca.remote.dns=true");
@@ -839,7 +843,12 @@ int java_init(euca_opts *args, java_home_t *data) {
839 843
 	arg.options = opt;
840 844
 	if (debug) {
841 845
 		__debug("+-------------------------------------------------------");
842  
-		__debug("| Version:                       %x", arg.version);
  846
+		if (strlen(GETARG(args, extra_version)) > 1 && strncmp(GETARG(args, extra_version), "@", 1))
  847
+			__debug("| Eucalyptus version:            %s-%s", ARGUMENTS_VERSION, GETARG(args, extra_version));
  848
+                else
  849
+			__debug("| Eucalyptus version:            %s", ARGUMENTS_VERSION);
  850
+
  851
+		__debug("| JNI version:                   %x", arg.version);
843 852
 		__debug("| Ignore Unrecognized Arguments: %d", arg.ignoreUnrecognized);
844 853
 		__debug("| Extra options:                 %d", arg.nOptions);
845 854
 		for (x = 0; x < arg.nOptions; x++)
200  clc/modules/bootstrap/src/main/native/eucalyptus-opts.c
... ...
@@ -1,5 +1,5 @@
1 1
 /*
2  
-  File autogenerated by gengetopt version 2.22.2
  2
+  File autogenerated by gengetopt version 2.22.3
3 3
   generated with the following command:
4 4
   gengetopt --input=arguments.ggo --file-name=eucalyptus-opts --func-name=arguments --arg-struct-name=eucalyptus_opts 
5 5
 
@@ -21,7 +21,7 @@
21 21
 #define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
22 22
 #endif
23 23
 
24  
-#include "getopt.h"
  24
+#include <getopt.h>
25 25
 
26 26
 #include "eucalyptus-opts.h"
27 27
 
@@ -37,7 +37,8 @@ const char *eucalyptus_opts_full_help[] = {
37 37
   "  -V, --version                 Print version and exit",
38 38
   "\nBootstrap Configuration:",
39 39
   "  -u, --user=USERNAME           User to drop privs to after starting.  \n                                  (default=`eucalyptus')",
40  
-  "  -h, --home=DIRECTORY          Eucalyptus home directory.  \n                                  (default=`/opt/git-main/')",
  40
+  "  -h, --home=DIRECTORY          Eucalyptus home directory.  (default=`/')",
  41
+  "      --extra-version=EXTRAVERSION\n                                Extra version string.  (default=`')",
41 42
   "      --initialize              Perform first-time setup.  This is run one time \n                                  (only!) on the first cloud controller before \n                                  the first time it is run.  (default=off)",
42 43
   "  -i, --bind-addr=HOSTNAME      Specifying this option causes eucalyptus-cloud \n                                  to only bind the specified local addresses.  \n                                  The default behaviour is to listen on the any \n                                  address while determining the user facing \n                                  local address based on default route and \n                                  netmask size.",
43 44
   "  -b, --bootstrap-host=HOSTNAME Host to be used for bootstrapping group \n                                  membership.  Many can be provided.  Note this \n                                  should only be necessary when UDP multicast \n                                  is not available.",
@@ -45,7 +46,7 @@ const char *eucalyptus_opts_full_help[] = {
45 46
   "  -D, --define=STRING           Set system properties.",
46 47
   "  -f, --fork                    Fork and daemonize Eucalyptus.  (default=off)",
47 48
   "  -k, --kill                    Kill a daemonized Eucalyptus.  (default=off)",
48  
-  "      --pidfile=FILENAME        Location for the pidfile.  \n                                  (default=`/opt/git-main/var/run/eucalyptus-cloud.pid')",
  49
+  "      --pidfile=FILENAME        Location for the pidfile.  \n                                  (default=`/var/run/eucalyptus-cloud.pid')",
49 50
   "      --db-home=DIRECTORY       Set path to database home directory  \n                                  (default=`/usr/pgsql-9.1/')",
50 51
   "\nLogging Configuration:",
51 52
   "  -l, --log-level=FILENAME      Control the log level for console output.  \n                                  (default=`INFO')",
@@ -68,7 +69,7 @@ const char *eucalyptus_opts_full_help[] = {
68 69
   "      --disable-dns             DEPRECATED DO NOT USE. IT DOES NOTHING.  \n                                  (default=off)",
69 70
   "      --disable-storage         DEPRECATED DO NOT USE. IT DOES NOTHING.  \n                                  (default=off)",
70 71
   "\nJava Options:",
71  
-  "  -j, --java-home=DIRECTORY     Alternative way to specify JAVA_HOME.  \n                                  (default=`/usr/lib/jvm/java-6-openjdk/')",
  72
+  "  -j, --java-home=DIRECTORY     Alternative way to specify JAVA_HOME.  \n                                  (default=`/usr/lib/jvm/java')",
72 73
   "      --jvm-name=JVMNAME        Which JVM type to run (see jvm.cfg).  \n                                  (default=`-server')",
73 74
   "  -X, --jvm-args=STRING         Arguments to pass to the JVM.",
74 75
   "      --jmx                     Launch with JMX enabled.  (default=off)",
@@ -92,36 +93,36 @@ init_help_array(void)
92 93
   eucalyptus_opts_help[3] = eucalyptus_opts_full_help[3];
93 94
   eucalyptus_opts_help[4] = eucalyptus_opts_full_help[4];
94 95
   eucalyptus_opts_help[5] = eucalyptus_opts_full_help[5];
95  
-  eucalyptus_opts_help[6] = eucalyptus_opts_full_help[6];
96  
-  eucalyptus_opts_help[7] = eucalyptus_opts_full_help[7];
97  
-  eucalyptus_opts_help[8] = eucalyptus_opts_full_help[8];
98  
-  eucalyptus_opts_help[9] = eucalyptus_opts_full_help[10];
99  
-  eucalyptus_opts_help[10] = eucalyptus_opts_full_help[11];
100  
-  eucalyptus_opts_help[11] = eucalyptus_opts_full_help[12];
101  
-  eucalyptus_opts_help[12] = eucalyptus_opts_full_help[13];
102  
-  eucalyptus_opts_help[13] = eucalyptus_opts_full_help[14];
103  
-  eucalyptus_opts_help[14] = eucalyptus_opts_full_help[15];
104  
-  eucalyptus_opts_help[15] = eucalyptus_opts_full_help[16];
105  
-  eucalyptus_opts_help[16] = eucalyptus_opts_full_help[17];
106  
-  eucalyptus_opts_help[17] = eucalyptus_opts_full_help[18];
107  
-  eucalyptus_opts_help[18] = eucalyptus_opts_full_help[19];
108  
-  eucalyptus_opts_help[19] = eucalyptus_opts_full_help[20];
109  
-  eucalyptus_opts_help[20] = eucalyptus_opts_full_help[21];
110  
-  eucalyptus_opts_help[21] = eucalyptus_opts_full_help[22];
111  
-  eucalyptus_opts_help[22] = eucalyptus_opts_full_help[23];
112  
-  eucalyptus_opts_help[23] = eucalyptus_opts_full_help[24];
113  
-  eucalyptus_opts_help[24] = eucalyptus_opts_full_help[25];
114  
-  eucalyptus_opts_help[25] = eucalyptus_opts_full_help[26];
115  
-  eucalyptus_opts_help[26] = eucalyptus_opts_full_help[30];
116  
-  eucalyptus_opts_help[27] = eucalyptus_opts_full_help[35];
117  
-  eucalyptus_opts_help[28] = eucalyptus_opts_full_help[36];
118  
-  eucalyptus_opts_help[29] = eucalyptus_opts_full_help[38];
119  
-  eucalyptus_opts_help[30] = eucalyptus_opts_full_help[39];
120  
-  eucalyptus_opts_help[31] = eucalyptus_opts_full_help[40];
121  
-  eucalyptus_opts_help[32] = eucalyptus_opts_full_help[41];
122  
-  eucalyptus_opts_help[33] = eucalyptus_opts_full_help[42];
123  
-  eucalyptus_opts_help[34] = eucalyptus_opts_full_help[43];
124  
-  eucalyptus_opts_help[35] = eucalyptus_opts_full_help[44];
  96
+  eucalyptus_opts_help[6] = eucalyptus_opts_full_help[7];
  97
+  eucalyptus_opts_help[7] = eucalyptus_opts_full_help[8];
  98
+  eucalyptus_opts_help[8] = eucalyptus_opts_full_help[9];
  99
+  eucalyptus_opts_help[9] = eucalyptus_opts_full_help[11];
  100
+  eucalyptus_opts_help[10] = eucalyptus_opts_full_help[12];
  101
+  eucalyptus_opts_help[11] = eucalyptus_opts_full_help[13];
  102
+  eucalyptus_opts_help[12] = eucalyptus_opts_full_help[14];
  103
+  eucalyptus_opts_help[13] = eucalyptus_opts_full_help[15];
  104
+  eucalyptus_opts_help[14] = eucalyptus_opts_full_help[16];
  105
+  eucalyptus_opts_help[15] = eucalyptus_opts_full_help[17];
  106
+  eucalyptus_opts_help[16] = eucalyptus_opts_full_help[18];
  107
+  eucalyptus_opts_help[17] = eucalyptus_opts_full_help[19];
  108
+  eucalyptus_opts_help[18] = eucalyptus_opts_full_help[20];
  109
+  eucalyptus_opts_help[19] = eucalyptus_opts_full_help[21];
  110
+  eucalyptus_opts_help[20] = eucalyptus_opts_full_help[22];
  111
+  eucalyptus_opts_help[21] = eucalyptus_opts_full_help[23];
  112
+  eucalyptus_opts_help[22] = eucalyptus_opts_full_help[24];
  113
+  eucalyptus_opts_help[23] = eucalyptus_opts_full_help[25];
  114
+  eucalyptus_opts_help[24] = eucalyptus_opts_full_help[26];
  115
+  eucalyptus_opts_help[25] = eucalyptus_opts_full_help[27];
  116
+  eucalyptus_opts_help[26] = eucalyptus_opts_full_help[31];
  117
+  eucalyptus_opts_help[27] = eucalyptus_opts_full_help[36];
  118
+  eucalyptus_opts_help[28] = eucalyptus_opts_full_help[37];
  119
+  eucalyptus_opts_help[29] = eucalyptus_opts_full_help[39];
  120
+  eucalyptus_opts_help[30] = eucalyptus_opts_full_help[40];
  121
+  eucalyptus_opts_help[31] = eucalyptus_opts_full_help[41];
  122
+  eucalyptus_opts_help[32] = eucalyptus_opts_full_help[42];
  123
+  eucalyptus_opts_help[33] = eucalyptus_opts_full_help[43];
  124
+  eucalyptus_opts_help[34] = eucalyptus_opts_full_help[44];
  125
+  eucalyptus_opts_help[35] = eucalyptus_opts_full_help[45];
125 126
   eucalyptus_opts_help[36] = 0; 
126 127
   
127 128
 }
@@ -140,7 +141,7 @@ static
140 141
 void clear_args (struct eucalyptus_opts *args_info);
141 142
 
142 143
 static int
143  
-arguments_internal (int argc, char * const *argv, struct eucalyptus_opts *args_info,
  144
+arguments_internal (int argc, char **argv, struct eucalyptus_opts *args_info,
144 145
                         struct arguments_params *params, const char *additional_error);
145 146
 
146 147
 static int
@@ -157,6 +158,7 @@ void clear_given (struct eucalyptus_opts *args_info)
157 158
   args_info->version_given = 0 ;
158 159
   args_info->user_given = 0 ;
159 160
   args_info->home_given = 0 ;
  161
+  args_info->extra_version_given = 0 ;
160 162
   args_info->initialize_given = 0 ;
161 163
   args_info->bind_addr_given = 0 ;
162 164
   args_info->bootstrap_host_given = 0 ;
@@ -204,8 +206,10 @@ void clear_args (struct eucalyptus_opts *args_info)
204 206
   FIX_UNUSED (args_info);
205 207
   args_info->user_arg = gengetopt_strdup ("eucalyptus");
206 208
   args_info->user_orig = NULL;
207  
-  args_info->home_arg = gengetopt_strdup ("/opt/git-main/");
  209
+  args_info->home_arg = gengetopt_strdup ("/");
208 210
   args_info->home_orig = NULL;
  211
+  args_info->extra_version_arg = gengetopt_strdup ("");
  212
+  args_info->extra_version_orig = NULL;
209 213
   args_info->initialize_flag = 0;
210 214
   args_info->bind_addr_arg = NULL;
211 215
   args_info->bind_addr_orig = NULL;
@@ -216,7 +220,7 @@ void clear_args (struct eucalyptus_opts *args_info)
216 220
   args_info->define_orig = NULL;
217 221
   args_info->fork_flag = 0;
218 222
   args_info->kill_flag = 0;
219  
-  args_info->pidfile_arg = gengetopt_strdup ("/opt/git-main/var/run/eucalyptus-cloud.pid");
  223
+  args_info->pidfile_arg = gengetopt_strdup ("/var/run/eucalyptus-cloud.pid");
220 224
   args_info->pidfile_orig = NULL;
221 225
   args_info->db_home_arg = gengetopt_strdup ("/usr/pgsql-9.1/");
222 226
   args_info->db_home_orig = NULL;
@@ -273,55 +277,56 @@ void init_args_info(struct eucalyptus_opts *args_info)
273 277
   args_info->version_help = eucalyptus_opts_full_help[2] ;
274 278
   args_info->user_help = eucalyptus_opts_full_help[4] ;
275 279
   args_info->home_help = eucalyptus_opts_full_help[5] ;
276  
-  args_info->initialize_help = eucalyptus_opts_full_help[6] ;
277  
-  args_info->bind_addr_help = eucalyptus_opts_full_help[7] ;
  280
+  args_info->extra_version_help = eucalyptus_opts_full_help[6] ;
  281
+  args_info->initialize_help = eucalyptus_opts_full_help[7] ;
  282
+  args_info->bind_addr_help = eucalyptus_opts_full_help[8] ;
278 283
   args_info->bind_addr_min = 0;
279 284
   args_info->bind_addr_max = 0;
280  
-  args_info->bootstrap_host_help = eucalyptus_opts_full_help[8] ;
  285
+  args_info->bootstrap_host_help = eucalyptus_opts_full_help[9] ;
281 286
   args_info->bootstrap_host_min = 0;
282 287
   args_info->bootstrap_host_max = 0;
283  
-  args_info->force_remote_bootstrap_help = eucalyptus_opts_full_help[9] ;
284  
-  args_info->define_help = eucalyptus_opts_full_help[10] ;
  288
+  args_info->force_remote_bootstrap_help = eucalyptus_opts_full_help[10] ;
  289
+  args_info->define_help = eucalyptus_opts_full_help[11] ;
285 290
   args_info->define_min = 0;
286 291
   args_info->define_max = 0;
287  
-  args_info->fork_help = eucalyptus_opts_full_help[11] ;
288  
-  args_info->kill_help = eucalyptus_opts_full_help[12] ;
289  
-  args_info->pidfile_help = eucalyptus_opts_full_help[13] ;
290  
-  args_info->db_home_help = eucalyptus_opts_full_help[14] ;
291  
-  args_info->log_level_help = eucalyptus_opts_full_help[16] ;
292  
-  args_info->log_appender_help = eucalyptus_opts_full_help[17] ;
293  
-  args_info->exhaustive_help = eucalyptus_opts_full_help[18] ;
294  
-  args_info->exhaustive_db_help = eucalyptus_opts_full_help[19] ;
295  
-  args_info->exhaustive_user_help = eucalyptus_opts_full_help[20] ;
296  
-  args_info->exhaustive_cc_help = eucalyptus_opts_full_help[21] ;
297  
-  args_info->exhaustive_external_help = eucalyptus_opts_full_help[22] ;
298  
-  args_info->out_help = eucalyptus_opts_full_help[23] ;
299  
-  args_info->err_help = eucalyptus_opts_full_help[24] ;
300  
-  args_info->remote_dns_help = eucalyptus_opts_full_help[26] ;
301  
-  args_info->remote_cloud_help = eucalyptus_opts_full_help[27] ;
302  
-  args_info->remote_walrus_help = eucalyptus_opts_full_help[28] ;
303  
-  args_info->remote_storage_help = eucalyptus_opts_full_help[29] ;
304  
-  args_info->disable_iscsi_help = eucalyptus_opts_full_help[30] ;
305  
-  args_info->disable_cloud_help = eucalyptus_opts_full_help[31] ;
306  
-  args_info->disable_walrus_help = eucalyptus_opts_full_help[32] ;
307  
-  args_info->disable_dns_help = eucalyptus_opts_full_help[33] ;
308  
-  args_info->disable_storage_help = eucalyptus_opts_full_help[34] ;
309  
-  args_info->java_home_help = eucalyptus_opts_full_help[36] ;
  292
+  args_info->fork_help = eucalyptus_opts_full_help[12] ;
  293
+  args_info->kill_help = eucalyptus_opts_full_help[13] ;
  294
+  args_info->pidfile_help = eucalyptus_opts_full_help[14] ;
  295
+  args_info->db_home_help = eucalyptus_opts_full_help[15] ;
  296
+  args_info->log_level_help = eucalyptus_opts_full_help[17] ;
  297
+  args_info->log_appender_help = eucalyptus_opts_full_help[18] ;
  298
+  args_info->exhaustive_help = eucalyptus_opts_full_help[19] ;
  299
+  args_info->exhaustive_db_help = eucalyptus_opts_full_help[20] ;
  300
+  args_info->exhaustive_user_help = eucalyptus_opts_full_help[21] ;
  301
+  args_info->exhaustive_cc_help = eucalyptus_opts_full_help[22] ;
  302
+  args_info->exhaustive_external_help = eucalyptus_opts_full_help[23] ;
  303
+  args_info->out_help = eucalyptus_opts_full_help[24] ;
  304
+  args_info->err_help = eucalyptus_opts_full_help[25] ;
  305
+  args_info->remote_dns_help = eucalyptus_opts_full_help[27] ;
  306
+  args_info->remote_cloud_help = eucalyptus_opts_full_help[28] ;
  307
+  args_info->remote_walrus_help = eucalyptus_opts_full_help[29] ;
  308
+  args_info->remote_storage_help = eucalyptus_opts_full_help[30] ;
  309
+  args_info->disable_iscsi_help = eucalyptus_opts_full_help[31] ;
  310
+  args_info->disable_cloud_help = eucalyptus_opts_full_help[32] ;
  311
+  args_info->disable_walrus_help = eucalyptus_opts_full_help[33] ;
  312
+  args_info->disable_dns_help = eucalyptus_opts_full_help[34] ;
  313
+  args_info->disable_storage_help = eucalyptus_opts_full_help[35] ;
  314
+  args_info->java_home_help = eucalyptus_opts_full_help[37] ;
310 315
   args_info->java_home_min = 0;
311 316
   args_info->java_home_max = 0;
312  
-  args_info->jvm_name_help = eucalyptus_opts_full_help[37] ;
313  
-  args_info->jvm_args_help = eucalyptus_opts_full_help[38] ;
  317
+  args_info->jvm_name_help = eucalyptus_opts_full_help[38] ;
  318
+  args_info->jvm_args_help = eucalyptus_opts_full_help[39] ;
314 319
   args_info->jvm_args_min = 0;
315 320
   args_info->jvm_args_max = 0;
316  
-  args_info->jmx_help = eucalyptus_opts_full_help[39] ;
317  
-  args_info->debug_help = eucalyptus_opts_full_help[40] ;
318  
-  args_info->verbose_help = eucalyptus_opts_full_help[41] ;
319  
-  args_info->debug_port_help = eucalyptus_opts_full_help[42] ;
320  
-  args_info->debug_noha_help = eucalyptus_opts_full_help[43] ;
321  
-  args_info->debug_suspend_help = eucalyptus_opts_full_help[44] ;
322  
-  args_info->profile_help = eucalyptus_opts_full_help[45] ;
323  
-  args_info->profiler_home_help = eucalyptus_opts_full_help[46] ;
324  
-  args_info->agentlib_help = eucalyptus_opts_full_help[47] ;
  321
+  args_info->jmx_help = eucalyptus_opts_full_help[40] ;
  322
+  args_info->debug_help = eucalyptus_opts_full_help[41] ;
  323
+  args_info->verbose_help = eucalyptus_opts_full_help[42] ;
  324
+  args_info->debug_port_help = eucalyptus_opts_full_help[43] ;
  325
+  args_info->debug_noha_help = eucalyptus_opts_full_help[44] ;
  326
+  args_info->debug_suspend_help = eucalyptus_opts_full_help[45] ;
  327
+  args_info->profile_help = eucalyptus_opts_full_help[46] ;
  328
+  args_info->profiler_home_help = eucalyptus_opts_full_help[47] ;
  329
+  args_info->agentlib_help = eucalyptus_opts_full_help[48] ;
325 330
   
326 331
 }
327 332
 
@@ -460,6 +465,8 @@ arguments_release (struct eucalyptus_opts *args_info)
460 465
   free_string_field (&(args_info->user_orig));
461 466
   free_string_field (&(args_info->home_arg));
462 467
   free_string_field (&(args_info->home_orig));
  468
+  free_string_field (&(args_info->extra_version_arg));
  469
+  free_string_field (&(args_info->extra_version_orig));
463 470
   free_multiple_string_field (args_info->bind_addr_given, &(args_info->bind_addr_arg), &(args_info->bind_addr_orig));
464 471
   free_multiple_string_field (args_info->bootstrap_host_given, &(args_info->bootstrap_host_arg), &(args_info->bootstrap_host_orig));
465 472
   free_multiple_string_field (args_info->define_given, &(args_info->define_arg), &(args_info->define_orig));
@@ -532,6 +539,8 @@ arguments_dump(FILE *outfile, struct eucalyptus_opts *args_info)
532 539
     write_into_file(outfile, "user", args_info->user_orig, 0);
533 540
   if (args_info->home_given)
534 541
     write_into_file(outfile, "home", args_info->home_orig, 0);
  542
+  if (args_info->extra_version_given)
  543
+    write_into_file(outfile, "extra-version", args_info->extra_version_orig, 0);
535 544
   if (args_info->initialize_given)
536 545
     write_into_file(outfile, "initialize", 0, 0 );
537 546
   write_multiple_into_file(outfile, args_info->bind_addr_given, "bind-addr", args_info->bind_addr_orig, 0);
@@ -787,13 +796,13 @@ check_multiple_option_occurrences(const char *prog_name, unsigned int option_giv
787 796
   return error;
788 797
 }
789 798
 int
790  
-arguments (int argc, char * const *argv, struct eucalyptus_opts *args_info)
  799
+arguments (int argc, char **argv, struct eucalyptus_opts *args_info)
791 800
 {
792 801
   return arguments2 (argc, argv, args_info, 0, 1, 1);
793 802
 }
794 803
 
795 804
 int
796  
-arguments_ext (int argc, char * const *argv, struct eucalyptus_opts *args_info,
  805
+arguments_ext (int argc, char **argv, struct eucalyptus_opts *args_info,
797 806
                    struct arguments_params *params)
798 807
 {
799 808
   int result;
@@ -809,7 +818,7 @@ arguments_ext (int argc, char * const *argv, struct eucalyptus_opts *args_info,
809 818
 }
810 819
 
811 820
 int
812  
-arguments2 (int argc, char * const *argv, struct eucalyptus_opts *args_info, int override, int initialize, int check_required)
  821
+arguments2 (int argc, char **argv, struct eucalyptus_opts *args_info, int override, int initialize, int check_required)
813 822
 {
814 823
   int result;
815 824
   struct arguments_params params;
@@ -851,8 +860,8 @@ arguments_required (struct eucalyptus_opts *args_info, const char *prog_name)
851 860
 int
852 861
 arguments_required2 (struct eucalyptus_opts *args_info, const char *prog_name, const char *additional_error)
853 862
 {
854  
-  FIX_UNUSED (additional_error);
855 863
   int error = 0;
  864
+  FIX_UNUSED (additional_error);
856 865
 
857 866
   /* checks for required options */
858 867
   if (check_multiple_option_occurrences(prog_name, args_info->bind_addr_given, args_info->bind_addr_min, args_info->bind_addr_max, "'--bind-addr' ('-i')"))
@@ -928,11 +937,11 @@ int update_arg(void *field, char **orig_field,
928 937
                const char *long_opt, char short_opt,
929 938
                const char *additional_error)
930 939
 {
931  
-  FIX_UNUSED (field);
932 940
   char *stop_char = 0;
933 941
   const char *val = value;
934 942
   int found;
935 943
   char **string_field;
  944
+  FIX_UNUSED (field);
936 945
 
937 946
   stop_char = 0;
938 947
   found = 0;
@@ -1144,7 +1153,7 @@ void update_multiple_arg(void *field, char ***orig_field,
1144 1153
 
1145 1154
 int
1146 1155
 arguments_internal (
1147  
-  int argc, char * const *argv, struct eucalyptus_opts *args_info,
  1156
+  int argc, char **argv, struct eucalyptus_opts *args_info,
1148 1157
                         struct arguments_params *params, const char *additional_error)
1149 1158
 {
1150 1159
   int c;	/* Character of the parsed option.  */
@@ -1190,6 +1199,7 @@ arguments_internal (
1190 1199
         { "version",	0, NULL, 'V' },
1191 1200
         { "user",	1, NULL, 'u' },
1192 1201
         { "home",	1, NULL, 'h' },
  1202
+        { "extra-version",	1, NULL, 0 },
1193 1203
         { "initialize",	0, NULL, 0 },
1194 1204
         { "bind-addr",	1, NULL, 'i' },
1195 1205
         { "bootstrap-host",	1, NULL, 'b' },
@@ -1260,7 +1270,7 @@ arguments_internal (
1260 1270
         
1261 1271
           if (update_arg( (void *)&(args_info->home_arg), 
1262 1272
                &(args_info->home_orig), &(args_info->home_given),
1263  
-              &(local_args_info.home_given), optarg, 0, "/opt/git-main/", ARG_STRING,
  1273
+              &(local_args_info.home_given), optarg, 0, "/", ARG_STRING,
1264 1274
               check_ambiguity, override, 0, 0,
1265 1275
               "home", 'h',
1266 1276
               additional_error))
@@ -1375,7 +1385,7 @@ arguments_internal (
1375 1385
         case 'j':	/* Alternative way to specify JAVA_HOME..  */
1376 1386
         
1377 1387
           if (update_multiple_arg_temp(&java_home_list, 
1378  
-              &(local_args_info.java_home_given), optarg, 0, "/usr/lib/jvm/java-6-openjdk/", ARG_STRING,
  1388
+              &(local_args_info.java_home_given), optarg, 0, "/usr/lib/jvm/java", ARG_STRING,
1379 1389
               "java-home", 'j',
1380 1390
               additional_error))
1381 1391
             goto failure;
@@ -1434,8 +1444,22 @@ arguments_internal (
1434 1444
             exit (EXIT_SUCCESS);
1435 1445
           }
1436 1446
 
  1447
+          /* Extra version string..  */
  1448
+          if (strcmp (long_options[option_index].name, "extra-version") == 0)
  1449
+          {
  1450
+          
  1451
+          
  1452
+            if (update_arg( (void *)&(args_info->extra_version_arg), 
  1453
+                 &(args_info->extra_version_orig), &(args_info->extra_version_given),
  1454
+                &(local_args_info.extra_version_given), optarg, 0, "", ARG_STRING,
  1455
+                check_ambiguity, override, 0, 0,
  1456
+                "extra-version", '-',
  1457
+                additional_error))
  1458
+              goto failure;
  1459
+          
  1460
+          }
1437 1461
           /* Perform first-time setup.  This is run one time (only!) on the first cloud controller before the first time it is run..  */
1438  
-          if (strcmp (long_options[option_index].name, "initialize") == 0)
  1462
+          else if (strcmp (long_options[option_index].name, "initialize") == 0)
1439 1463
           {
1440 1464
           
1441 1465
           
@@ -1465,7 +1489,7 @@ arguments_internal (
1465 1489
           
1466 1490
             if (update_arg( (void *)&(args_info->pidfile_arg), 
1467 1491
                  &(args_info->pidfile_orig), &(args_info->pidfile_given),
1468  
-                &(local_args_info.pidfile_given), optarg, 0, "/opt/git-main/var/run/eucalyptus-cloud.pid", ARG_STRING,
  1492
+                &(local_args_info.pidfile_given), optarg, 0, "/var/run/eucalyptus-cloud.pid", ARG_STRING,
1469 1493
                 check_ambiguity, override, 0, 0,
1470 1494
                 "pidfile", '-',
1471 1495
                 additional_error))
@@ -1759,7 +1783,7 @@ arguments_internal (
1759 1783
     &(args_info->define_orig), args_info->define_given,
1760 1784
     local_args_info.define_given, 0,
1761 1785
     ARG_STRING, define_list);
1762  
-  multiple_default_value.default_string_arg = "/usr/lib/jvm/java-6-openjdk/";
  1786
+  multiple_default_value.default_string_arg = "/usr/lib/jvm/java";
1763 1787
   update_multiple_arg((void *)&(args_info->java_home_arg),
1764 1788
     &(args_info->java_home_orig), args_info->java_home_given,
1765 1789
     local_args_info.java_home_given, &multiple_default_value,
23  clc/modules/bootstrap/src/main/native/eucalyptus-opts.h
... ...
@@ -1,6 +1,6 @@
1 1
 /** @file eucalyptus-opts.h
2 2
  *  @brief The header file for the command line option parser
3  
- *  generated by GNU Gengetopt version 2.22.2
  3
+ *  generated by GNU Gengetopt version 2.22.3
4 4
  *  http://www.gnu.org/software/gengetopt.
5 5
  *  DO NOT modify this file, since it can be overwritten
6 6
  *  @author GNU Gengetopt by Lorenzo Bettini */
@@ -34,11 +34,6 @@ extern "C" {
34 34
 #define ARGUMENTS_VERSION "3.1.0"
35 35
 #endif
36 36
 
37  
-#ifndef ARGUMENTS_EXTRA_VERSION
38  
-/** @brief Eucalyptus extra version string */
39  
-#define ARGUMENTS_EXTRA_VERSION "unconfigured"
40  
-#endif
41  
-
42 37
 /** @brief Where the command line options are stored */
43 38
 struct eucalyptus_opts
44 39
 {
@@ -48,9 +43,12 @@ struct eucalyptus_opts
48 43
   char * user_arg;	/**< @brief User to drop privs to after starting. (default='eucalyptus').  */
49 44
   char * user_orig;	/**< @brief User to drop privs to after starting. original value given at command line.  */
50 45
   const char *user_help; /**< @brief User to drop privs to after starting. help description.  */
51  
-  char * home_arg;	/**< @brief Eucalyptus home directory. (default='/opt/git-main/').  */
  46
+  char * home_arg;	/**< @brief Eucalyptus home directory. (default='/').  */
52 47
   char * home_orig;	/**< @brief Eucalyptus home directory. original value given at command line.  */
53 48
   const char *home_help; /**< @brief Eucalyptus home directory. help description.  */
  49
+  char * extra_version_arg;	/**< @brief Extra version string. (default='').  */
  50
+  char * extra_version_orig;	/**< @brief Extra version string. original value given at command line.  */
  51
+  const char *extra_version_help; /**< @brief Extra version string. help description.  */
54 52
   int initialize_flag;	/**< @brief Perform first-time setup.  This is run one time (only!) on the first cloud controller before the first time it is run. (default=off).  */
55 53
   const char *initialize_help; /**< @brief Perform first-time setup.  This is run one time (only!) on the first cloud controller before the first time it is run. help description.  */
56 54
   char ** bind_addr_arg;	/**< @brief Specifying this option causes eucalyptus-cloud to only bind the specified local addresses.  The default behaviour is to listen on the any address while determining the user facing local address based on default route and netmask size..  */
@@ -74,7 +72,7 @@ struct eucalyptus_opts
74 72
   const char *fork_help; /**< @brief Fork and daemonize Eucalyptus. help description.  */
75 73
   int kill_flag;	/**< @brief Kill a daemonized Eucalyptus. (default=off).  */
76 74
   const char *kill_help; /**< @brief Kill a daemonized Eucalyptus. help description.  */
77  
-  char * pidfile_arg;	/**< @brief Location for the pidfile. (default='/opt/git-main/var/run/eucalyptus-cloud.pid').  */
  75
+  char * pidfile_arg;	/**< @brief Location for the pidfile. (default='/var/run/eucalyptus-cloud.pid').  */
78 76
   char * pidfile_orig;	/**< @brief Location for the pidfile. original value given at command line.  */
79 77
   const char *pidfile_help; /**< @brief Location for the pidfile. help description.  */
80 78
   char * db_home_arg;	/**< @brief Set path to database home directory (default='/usr/pgsql-9.1/').  */
@@ -120,7 +118,7 @@ struct eucalyptus_opts
120 118
   const char *disable_dns_help; /**< @brief DEPRECATED DO NOT USE. IT DOES NOTHING. help description.  */
121 119
   int disable_storage_flag;	/**< @brief DEPRECATED DO NOT USE. IT DOES NOTHING. (default=off).  */
122 120
   const char *disable_storage_help; /**< @brief DEPRECATED DO NOT USE. IT DOES NOTHING. help description.  */
123  
-  char ** java_home_arg;	/**< @brief Alternative way to specify JAVA_HOME. (default='/usr/lib/jvm/java-6-openjdk/').  */
  121
+  char ** java_home_arg;	/**< @brief Alternative way to specify JAVA_HOME. (default='/usr/lib/jvm/java').  */
124 122
   char ** java_home_orig;	/**< @brief Alternative way to specify JAVA_HOME. original value given at command line.  */
125 123
   unsigned int java_home_min; /**< @brief Alternative way to specify JAVA_HOME.'s minimum occurreces */
126 124
   unsigned int java_home_max; /**< @brief Alternative way to specify JAVA_HOME.'s maximum occurreces */
@@ -160,6 +158,7 @@ struct eucalyptus_opts
160 158
   unsigned int version_given ;	/**< @brief Whether version was given.  */
161 159
   unsigned int user_given ;	/**< @brief Whether user was given.  */
162 160
   unsigned int home_given ;	/**< @brief Whether home was given.  */
  161
+  unsigned int extra_version_given ;	/**< @brief Whether extra-version was given.  */
163 162
   unsigned int initialize_given ;	/**< @brief Whether initialize was given.  */
164 163
   unsigned int bind_addr_given ;	/**< @brief Whether bind-addr was given.  */
165 164
   unsigned int bootstrap_host_given ;	/**< @brief Whether bootstrap-host was given.  */
@@ -228,7 +227,7 @@ extern const char *eucalyptus_opts_full_help[];
228 227
  * @param args_info the structure where option information will be stored
229 228
  * @return 0 if everything went fine, NON 0 if an error took place
230 229
  */
231  
-int arguments (int argc, char * const *argv,
  230
+int arguments (int argc, char **argv,
232 231
   struct eucalyptus_opts *args_info);
233 232
 
234 233
 /**
@@ -242,7 +241,7 @@ int arguments (int argc, char * const *argv,
242 241
  * @return 0 if everything went fine, NON 0 if an error took place
243 242
  * @deprecated use arguments_ext() instead
244 243
  */
245  
-int arguments2 (int argc, char * const *argv,
  244
+int arguments2 (int argc, char **argv,
246 245
   struct eucalyptus_opts *args_info,
247 246
   int override, int initialize, int check_required);
248 247
 
@@ -254,7 +253,7 @@ int arguments2 (int argc, char * const *argv,
254 253
  * @param params additional parameters for the parser
255 254
  * @return 0 if everything went fine, NON 0 if an error took place
256 255
  */
257  
-int arguments_ext (int argc, char * const *argv,
  256
+int arguments_ext (int argc, char **argv,
258 257
   struct eucalyptus_opts *args_info,
259 258
   struct arguments_params *params);
260 259
 
23  clc/modules/www/src/main/java/com/eucalyptus/webui/server/ConfigurationWebBackend.java
@@ -680,14 +680,23 @@ public static void setWalrusConfiguration( SearchResultRow input ) throws Eucaly
680 680
 	private static String getExternalIpAddress ( ) {
681 681
 		String ipAddr = null;
682 682
 		HttpClient httpClient = new HttpClient( );
  683
+
683 684
 		//set User-Agent
684  
-		String version = System.getProperty("euca.version");
685  
-    		String extraVersion = System.getProperty("euca.extra_version");
686  
-    		HttpParams defaultParams = httpClient.getParams().getDefaults();
687  
-    		httpClient.getParams().setParameter(HttpMethodParams.USER_AGENT,
688  
-                                        defaultParams.getParameter(
689  
-				        HttpMethodParams.USER_AGENT) + 
690  
-                                        " " + version + "-" + extraVersion);
  685
+		String clientVersion = (String)httpClient.getParams().getDefaults().getParameter(HttpMethodParams.USER_AGENT);
  686
+		String javaVersion   = System.getProperty("java.version");
  687
+		String osName        = System.getProperty("os.name");
  688
+		String osArch        = System.getProperty("os.arch");
  689
+		String eucaVersion   = System.getProperty("euca.version");
  690
+		String extraVersion  = System.getProperty("euca.extra_version");
  691
+
  692
+		// Jakarta Commons-HttpClient/3.1 (java 1.6.0_24; Linux amd64) Eucalyptus/3.1.0-1.el6
  693
+		String userAgent = clientVersion + " (java " + javaVersion + "; " +
  694
+				   osName + " " + osArch + ") Eucalyptus/" + eucaVersion;
  695
+		if (extraVersion != null) {
  696
+			userAgent = userAgent + "-" + extraVersion;
  697
+		}
  698
+
  699
+		httpClient.getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
691 700
 
692 701
 		//support for http proxy
693 702
 		if( HttpServerBootstrapper.httpProxyHost != null && ( HttpServerBootstrapper.httpProxyHost.length( ) > 0 ) ) {
24  clc/modules/www/src/main/java/com/eucalyptus/webui/server/DownloadsWebBackend.java
@@ -26,14 +26,24 @@
26 26
     ArrayList<DownloadInfo> downloadsList = Lists.newArrayList( );
27 27
 
28 28
     HttpClient httpClient = new HttpClient( );
  29
+
29 30
     //set User-Agent
30  
-    String version = System.getProperty("euca.version");
31  
-    String extraVersion = System.getProperty("euca.extra_version");
32  
-    HttpParams defaultParams = httpClient.getParams().getDefaults();
33  
-    httpClient.getParams().setParameter(HttpMethodParams.USER_AGENT,
34  
-                                        defaultParams.getParameter(
35  
-				        HttpMethodParams.USER_AGENT) + 
36  
-				        " " + version + "-" + extraVersion);
  31
+    String clientVersion = (String)httpClient.getParams().getDefaults().getParameter(HttpMethodParams.USER_AGENT);
  32
+    String javaVersion   = System.getProperty("java.version");
  33
+    String osName        = System.getProperty("os.name");
  34
+    String osArch        = System.getProperty("os.arch");
  35
+    String eucaVersion   = System.getProperty("euca.version");
  36
+    String extraVersion  = System.getProperty("euca.extra_version");
  37
+
  38
+    // Jakarta Commons-HttpClient/3.1 (java 1.6.0_24; Linux amd64) Eucalyptus/3.1.0-1.el6
  39
+    String userAgent = clientVersion + " (java " + javaVersion + "; " +
  40
+                       osName + " " + osArch + ") Eucalyptus/" + eucaVersion;
  41
+    if (extraVersion != null) {
  42
+        userAgent = userAgent + "-" + extraVersion;
  43
+    }
  44
+
  45
+    httpClient.getParams().setParameter(HttpMethodParams.USER_AGENT, userAgent);
  46
+
37 47
     //support for http proxy
38 48
     if ( HttpServerBootstrapper.httpProxyHost != null && (HttpServerBootstrapper.httpProxyHost.length( ) > 0 ) ) {
39 49
       String proxyHost = HttpServerBootstrapper.httpProxyHost;
800  configure
... ...
@@ -1,13 +1,13 @@
1 1
 #! /bin/sh
2 2
 # Guess values for system-dependent variables and create Makefiles.
3  
-# Generated by GNU Autoconf 2.65 for Eucalyptus 3.1.0.
  3
+# Generated by GNU Autoconf 2.68 for Eucalyptus 3.1.0.
4 4
 #
5 5
 # Report bugs to <support@open.eucalyptus.com>.
6 6
 #
7 7
 #
8 8
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
9  
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
10  
-# Inc.
  9
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
  10
+# Foundation, Inc.
11 11
 #
12 12
 #
13 13
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +91,7 @@ fi
91 91
 IFS=" ""	$as_nl"
92 92
 
93 93
 # Find who we are.  Look in the path if we contain no directory separator.
  94
+as_myself=
94 95
 case $0 in #((
95 96
   *[\\/]* ) as_myself=$0 ;;
96 97
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@ IFS=$as_save_IFS
216 217
   # We cannot yet assume a decent shell, so we have to provide a
217 218
 	# neutralization value for shells without unset; and this also
218 219
 	# works around shells that cannot unset nonexistent variables.
  220
+	# Preserve -v and -x to the replacement shell.
219 221
 	BASH_ENV=/dev/null
220 222
 	ENV=/dev/null
221 223
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
222 224
 	export CONFIG_SHELL
223  
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
  225
+	case $- in # ((((
  226
+	  *v*x* | *x*v* ) as_opts=-vx ;;
  227
+	  *v* ) as_opts=-v ;;
  228
+	  *x* ) as_opts=-x ;;
  229
+	  * ) as_opts= ;;
  230
+	esac
  231
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
224 232
 fi
225 233
 
226 234
     if test x$as_have_required = xno; then :
@@ -319,7 +327,7 @@ $as_echo X"$as_dir" |
319 327
       test -d "$as_dir" && break
320 328
     done
321 329
     test -z "$as_dirs" || eval "mkdir $as_dirs"
322  
-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
  330
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
323 331
 
324 332
 
325 333
 } # as_fn_mkdir_p
@@ -359,19 +367,19 @@ else
359 367
 fi # as_fn_arith
360 368
 
361 369
 
362  
-# as_fn_error ERROR [LINENO LOG_FD]
363  
-# ---------------------------------
  370
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
  371
+# ----------------------------------------
364 372
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
365 373
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
366  
-# script with status $?, using 1 if that was 0.
  374
+# script with STATUS, using 1 if that was 0.
367 375
 as_fn_error ()
368 376
 {
369  
-  as_status=$?; test $as_status -eq 0 && as_status=1
370  
-  if test "$3"; then
371  
-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
372  
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
  377
+  as_status=$1; test $as_status -eq 0 && as_status=1
  378
+  if test "$4"; then
  379
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  380
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
373 381
   fi
374  
-  $as_echo "$as_me: error: $1" >&2
  382
+  $as_echo "$as_me: error: $2" >&2
375 383
   as_fn_exit $as_status
376 384
 } # as_fn_error
377 385
 
@@ -533,7 +541,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
533 541
 exec 6>&1
534 542
 
535 543
 # Name of the host.
536  
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
  544
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
537 545
 # so uname gets run too.
538 546
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
539 547
 
@@ -609,7 +617,12 @@ AXIS2C_HOME
609 617
 APACHE2_MODULE_DIR
610 618
 JAVA_HOME
611 619
 TOP
  620
+EXTRA_VERSION
612 621
 EUCA_VERSION
  622
+host_os
  623
+host_vendor
  624
+host_cpu
  625
+host
613 626
 LIBOBJS
614 627
 JAVA
615 628
 ANT
@@ -630,7 +643,6 @@ PYTHON_EXEC_PREFIX
630 643
 PYTHON_PREFIX
631 644
 PYTHON_VERSION
632 645
 PYTHON
633  
-EXTRA_VERSION
634 646
 build_os
635 647
 build_vendor
636 648
 build_cpu
@@ -696,6 +708,7 @@ with_vddk
696 708
 with_interface_theme
697 709
 enable_appliance_store
698 710
 enable_debug
  711
+with_extra_version
699 712
 '
700 713
       ac_precious_vars='build_alias
701 714
 host_alias
@@ -706,7 +719,6 @@ LDFLAGS
706 719
 LIBS
707 720
 CPPFLAGS
708 721
 CPP
709  
-EXTRA_VERSION
710 722
 PYTHON'
711 723
 
712 724
 
@@ -770,8 +782,9 @@ do
770 782
   fi
771 783
 
772 784
   case $ac_option in
773  
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
774  
-  *)	ac_optarg=yes ;;
  785
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
  786
+  *=)   ac_optarg= ;;
  787
+  *)    ac_optarg=yes ;;
775 788
   esac
776 789
 
777 790
   # Accept the important Cygnus configure options, so we can diagnose typos.
@@ -816,7 +829,7 @@ do
816 829
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
817 830
     # Reject names that are not valid shell variable names.
818 831
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
819  
-      as_fn_error "invalid feature name: $ac_useropt"
  832
+      as_fn_error $? "invalid feature name: $ac_useropt"
820 833
     ac_useropt_orig=$ac_useropt
821 834
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
822 835
     case $ac_user_opts in
@@ -842,7 +855,7 @@ do
842 855
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
843 856
     # Reject names that are not valid shell variable names.
844 857
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
845  
-      as_fn_error "invalid feature name: $ac_useropt"
  858
+      as_fn_error $? "invalid feature name: $ac_useropt"
846 859
     ac_useropt_orig=$ac_useropt
847 860
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
848 861
     case $ac_user_opts in
@@ -1046,7 +1059,7 @@ do
1046 1059
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
1047 1060
     # Reject names that are not valid shell variable names.
1048 1061
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1049  
-      as_fn_error "invalid package name: $ac_useropt"
  1062
+      as_fn_error $? "invalid package name: $ac_useropt"
1050 1063
     ac_useropt_orig=$ac_useropt
1051 1064
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1052 1065
     case $ac_user_opts in
@@ -1062,7 +1075,7 @@ do
1062 1075
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
1063 1076
     # Reject names that are not valid shell variable names.
1064 1077
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
1065  
-      as_fn_error "invalid package name: $ac_useropt"
  1078
+      as_fn_error $? "invalid package name: $ac_useropt"
1066 1079
     ac_useropt_orig=$ac_useropt
1067 1080
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
1068 1081
     case $ac_user_opts in
@@ -1092,8 +1105,8 @@ do
1092 1105
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
1093 1106
     x_libraries=$ac_optarg ;;
1094 1107
 
1095  
-  -*) as_fn_error "unrecognized option: \`$ac_option'
1096  
-Try \`$0 --help' for more information."
  1108
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
  1109
+Try \`$0 --help' for more information"
1097 1110
     ;;
1098 1111
 
1099 1112
   *=*)
@@ -1101,7 +1114,7 @@ Try \`$0 --help' for more information."
1101 1114
     # Reject names that are not valid shell variable names.
1102 1115
     case $ac_envvar in #(
1103 1116
       '' | [0-9]* | *[!_$as_cr_alnum]* )
1104  
-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
  1117
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
1105 1118
     esac
1106 1119
     eval $ac_envvar=\$ac_optarg
1107 1120
     export $ac_envvar ;;
@@ -1111,7 +1124,7 @@ Try \`$0 --help' for more information."
1111 1124
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
1112 1125
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
1113 1126
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
1114  
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
  1127
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
1115 1128
     ;;
1116 1129
 
1117 1130
   esac
@@ -1119,13 +1132,13 @@ done
1119 1132
 
1120 1133
 if test -n "$ac_prev"; then
1121 1134
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
1122  
-  as_fn_error "missing argument to $ac_option"
  1135
+  as_fn_error $? "missing argument to $ac_option"
1123 1136
 fi
1124 1137
 
1125 1138
 if test -n "$ac_unrecognized_opts"; then
1126 1139
   case $enable_option_checking in
1127 1140
     no) ;;
1128  
-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
  1141
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
1129 1142
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
1130 1143
   esac
1131 1144
 fi
@@ -1148,7 +1161,7 @@ do
1148 1161
     [\\/$]* | ?:[\\/]* )  continue;;
1149 1162
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
1150 1163
   esac
1151  
-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  1164
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
1152 1165
 done
1153 1166
 
1154 1167
 # There might be people who depend on the old broken behavior: `$host'
@@ -1162,8 +1175,8 @@ target=$target_alias
1162 1175
 if test "x$host_alias" != x; then
1163 1176
   if test "x$build_alias" = x; then
1164 1177
     cross_compiling=maybe
1165  
-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
1166  
-    If a cross compiler is detected then cross compile mode will be used." >&2
  1178
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
  1179
+    If a cross compiler is detected then cross compile mode will be used" >&2
1167 1180
   elif test "x$build_alias" != "x$host_alias"; then
1168 1181
     cross_compiling=yes
1169 1182
   fi
@@ -1178,9 +1191,9 @@ test "$silent" = yes && exec 6>/dev/null
1178 1191
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
1179 1192
 ac_ls_di=`ls -di .` &&
1180 1193
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
1181  
-  as_fn_error "working directory cannot be determined"
  1194
+  as_fn_error $? "working directory cannot be determined"
1182 1195
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
1183  
-  as_fn_error "pwd does not report name of working directory"
  1196
+  as_fn_error $? "pwd does not report name of working directory"
1184 1197
 
1185 1198
 
1186 1199
 # Find the source files, if location was not specified.
@@ -1219,11 +1232,11 @@ else
1219 1232
 fi
1220 1233
 if test ! -r "$srcdir/$ac_unique_file"; then
1221 1234
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
1222  
-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
  1235
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
1223 1236
 fi
1224 1237
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
1225 1238
 ac_abs_confdir=`(
1226  
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
  1239
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
1227 1240
 	pwd)`
1228 1241
 # When building in place, set srcdir=.
1229 1242
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1263,7 +1276,7 @@ Configuration:
1263 1276
       --help=short        display options specific to this package
1264 1277
       --help=recursive    display the short help of all the included packages
1265 1278
   -V, --version           display version information and exit
1266  
-  -q, --quiet, --silent   do not print \`checking...' messages
  1279
+  -q, --quiet, --silent   do not print \`checking ...' messages
1267 1280
       --cache-file=FILE   cache test results in FILE [disabled]
1268 1281
   -C, --config-cache      alias for \`--cache-file=config.cache'
1269 1282
   -n, --no-create         do not create output files
@@ -1308,6 +1321,7 @@ _ACEOF
1308 1321
 
1309 1322
 System types:
1310 1323
   --build=BUILD     configure for building on BUILD [guessed]
  1324
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
1311 1325
 _ACEOF
1312 1326
 fi
1313 1327
 
@@ -1335,6 +1349,7 @@ Optional Packages:
1335 1349
   --with-wsdl2c-sh=<file>              where WSDL2C.sh is installed
1336 1350
   --with-vddk=<dir>                    where VMware's VDDK is installed
1337 1351
   --with-interface-theme=<name>        the theme to be used
  1352
+  --extra-version=<str>                string to append to versions to make logs and messages more precise
1338 1353
 
1339 1354
 Some influential environment variables:
1340 1355
   CC          C compiler command
@@ -1345,9 +1360,6 @@ Some influential environment variables:
1345 1360
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1346 1361
               you have headers in a nonstandard directory <include dir>
1347 1362
   CPP         C preprocessor
1348  
-  EXTRA_VERSION
1349  
-              extra version string that can be used for tracking provenance
1350  
-              (distro, architecture, "e.g. fc16-x86_64).
1351 1363
   PYTHON      the Python interpreter
1352 1364
 
1353 1365
 Use these variables to override the choices made by `configure' or to help
@@ -1417,9 +1429,9 @@ test -n "$ac_init_help" && exit $ac_status
1417 1429
 if $ac_init_version; then
1418 1430
   cat <<\_ACEOF
1419 1431
 Eucalyptus configure 3.1.0
1420  
-generated by GNU Autoconf 2.65
  1432
+generated by GNU Autoconf 2.68
1421 1433
 
1422  
-Copyright (C) 2009 Free Software Foundation, Inc.
  1434
+Copyright (C) 2010 Free Software Foundation, Inc.
1423 1435
 This configure script is free software; the Free Software Foundation
1424 1436
 gives unlimited permission to copy, distribute and modify it.
1425 1437
 _ACEOF
@@ -1463,7 +1475,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
1463 1475
 
1464 1476
 	ac_retval=1
1465 1477
 fi
1466  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1478
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1467 1479
   as_fn_set_status $ac_retval
1468 1480
 
1469 1481
 } # ac_fn_c_try_compile
@@ -1489,7 +1501,7 @@ $as_echo "$ac_try_echo"; } >&5
1489 1501
     mv -f conftest.er1 conftest.err
1490 1502
   fi
1491 1503
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1492  
-  test $ac_status = 0; } >/dev/null && {
  1504
+  test $ac_status = 0; } > conftest.i && {
1493 1505
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
1494 1506
 	 test ! -s conftest.err
1495 1507
        }; then :
@@ -1500,7 +1512,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
1500 1512
 
1501 1513
     ac_retval=1
1502 1514
 fi
1503  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1515
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1504 1516
   as_fn_set_status $ac_retval
1505 1517
 
1506 1518
 } # ac_fn_c_try_cpp
@@ -1513,10 +1525,10 @@ fi
1513 1525
 ac_fn_c_check_header_mongrel ()
1514 1526
 {
1515 1527
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1516  
-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1528
+  if eval \${$3+:} false; then :
1517 1529
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1518 1530
 $as_echo_n "checking for $2... " >&6; }
1519  
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1531
+if eval \${$3+:} false; then :
1520 1532
   $as_echo_n "(cached) " >&6
1521 1533
 fi
1522 1534
 eval ac_res=\$$3
@@ -1552,7 +1564,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
1552 1564
 else
1553 1565
   ac_header_preproc=no
1554 1566
 fi
1555  
-rm -f conftest.err conftest.$ac_ext
  1567
+rm -f conftest.err conftest.i conftest.$ac_ext
1556 1568
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
1557 1569
 $as_echo "$ac_header_preproc" >&6; }
1558 1570
 
@@ -1575,17 +1587,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
1575 1587
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
1576 1588
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
1577 1589
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
1578  
-( cat <<\_ASBOX
1579  
-## ------------------------------------------ ##
  1590
+( $as_echo "## ------------------------------------------ ##
1580 1591
 ## Report this to support@open.eucalyptus.com ##
1581  
-## ------------------------------------------ ##
1582  
-_ASBOX
  1592
+## ------------------------------------------ ##"
1583 1593
      ) | sed "s/^/$as_me: WARNING:     /" >&2
1584 1594
     ;;
1585 1595
 esac
1586 1596
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1587 1597
 $as_echo_n "checking for $2... " >&6; }
1588  
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1598
+if eval \${$3+:} false; then :
1589 1599
   $as_echo_n "(cached) " >&6
1590 1600
 else
1591 1601
   eval "$3=\$ac_header_compiler"
@@ -1594,7 +1604,7 @@ eval ac_res=\$$3
1594 1604
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1595 1605
 $as_echo "$ac_res" >&6; }
1596 1606
 fi
1597  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1607
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1598 1608
 
1599 1609
 } # ac_fn_c_check_header_mongrel
1600 1610
 
@@ -1635,7 +1645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
1635 1645
        ac_retval=$ac_status
1636 1646
 fi
1637 1647
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1638  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1648
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1639 1649
   as_fn_set_status $ac_retval
1640 1650
 
1641 1651
 } # ac_fn_c_try_run
@@ -1649,7 +1659,7 @@ ac_fn_c_check_header_compile ()
1649 1659
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1650 1660
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1651 1661
 $as_echo_n "checking for $2... " >&6; }
1652  
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1662
+if eval \${$3+:} false; then :
1653 1663
   $as_echo_n "(cached) " >&6
1654 1664
 else
1655 1665
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1667,7 +1677,7 @@ fi
1667 1677
 eval ac_res=\$$3
1668 1678
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1669 1679
 $as_echo "$ac_res" >&6; }
1670  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1680
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1671 1681
 
1672 1682
 } # ac_fn_c_check_header_compile
1673 1683
 
@@ -1712,7 +1722,7 @@ fi
1712 1722
   # interfere with the next link command; also delete a directory that is
1713 1723
   # left behind by Apple's compiler.  We do this before executing the actions.
1714 1724
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
1715  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1725
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1716 1726
   as_fn_set_status $ac_retval
1717 1727
 
1718 1728
 } # ac_fn_c_try_link
@@ -1726,7 +1736,7 @@ ac_fn_c_check_type ()
1726 1736
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1727 1737
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1728 1738
 $as_echo_n "checking for $2... " >&6; }
1729  
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1739
+if eval \${$3+:} false; then :
1730 1740
   $as_echo_n "(cached) " >&6
1731 1741
 else
1732 1742
   eval "$3=no"
@@ -1767,7 +1777,7 @@ fi
1767 1777
 eval ac_res=\$$3
1768 1778
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1769 1779
 $as_echo "$ac_res" >&6; }
1770  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1780
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1771 1781
 
1772 1782
 } # ac_fn_c_check_type
1773 1783
 
@@ -1780,7 +1790,7 @@ ac_fn_c_find_uintX_t ()
1780 1790
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1781 1791
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
1782 1792
 $as_echo_n "checking for uint$2_t... " >&6; }
1783  
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1793
+if eval \${$3+:} false; then :
1784 1794
   $as_echo_n "(cached) " >&6
1785 1795
 else
1786 1796
   eval "$3=no"
@@ -1810,8 +1820,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
1810 1820
 esac
1811 1821
 fi
1812 1822
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1813  
-       eval as_val=\$$3
1814  
-   if test "x$as_val" = x""no; then :
  1823
+       if eval test \"x\$"$3"\" = x"no"; then :
1815 1824
 
1816 1825
 else
1817 1826
   break
@@ -1821,7 +1830,7 @@ fi
1821 1830
 eval ac_res=\$$3
1822 1831
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1823 1832
 $as_echo "$ac_res" >&6; }
1824  
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  1833
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
1825 1834
 
1826 1835
 } # ac_fn_c_find_uintX_t
1827 1836
 
@@ -1833,7 +1842,7 @@ ac_fn_c_check_func ()
1833 1842
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1834 1843
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
1835 1844
 $as_echo_n "checking for $2... " >&6; }
1836  
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
  1845
+if eval \${$3+:} false; then :
1837 1846
   $as_echo_n "(cached) " >&6
1838 1847
 else
1839 1848
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1888,7 +1897,7 @@ fi
1888 1897
 eval ac_res=\$$3
1889 1898
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5