[llvm-commits] CVS: llvm-java/configure

[Alkis Evlogimenos]

Changes in directory llvm-java:

configure updated: 1.11 -> 1.12
---
Log message:

Make configure's error message more descriptive.


---
Diffs of the changes:  (+12 -9)

 configure |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)


Index: llvm-java/configure
diff -u llvm-java/configure:1.11 llvm-java/configure:1.12
--- llvm-java/configure:1.11	Fri Apr 22 21:25:17 2005
+++ llvm-java/configure	Wed May  4 21:53:51 2005
@@ -902,7 +902,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
@@ -1507,13 +1507,15 @@
 echo $ECHO_N "checking for GNU classpath libraries... $ECHO_C" >&6
 if test ! -f "$CLASSPATH_JAVA_LIBRARY_PATH/java/lang/Object.class"
 then
-  echo "$CLASSPATH_JAVA_LIBRARY_PATH/java/lang/Object.class"
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
   { { echo "$as_me:$LINENO: error: A flat installation of GNU classpath is required" >&5
 echo "$as_me: error: A flat installation of GNU classpath is required" >&2;}
    { (exit 1); exit 1; }; }
+else
+  echo "$as_me:$LINENO: result: $CLASSPATH_JAVA_LIBRARY_PATH" >&5
+echo "${ECHO_T}$CLASSPATH_JAVA_LIBRARY_PATH" >&6
 fi
-echo "$as_me:$LINENO: result: found at $CLASSPATH_JAVA_LIBRARY_PATH" >&5
-echo "${ECHO_T}found at $CLASSPATH_JAVA_LIBRARY_PATH" >&6
 
 
 
@@ -2350,11 +2352,6 @@
 
 
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -2393,6 +2390,12 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub