following issues fixed

1) santhakumar's fixed typo in 'configure' file, but that fix will go away if
someone run autoreconf again. the proper way to fix is by re-running autoreconf and put
all the changed files into repository. I have re-run autoreconf and commited the changed
files.
Merge branch 'upstream_master'