diff options
author | Pierre Letouzey <pierre.letouzey@inria.fr> | 2013-11-22 10:23:35 +0100 |
---|---|---|
committer | Pierre Letouzey <pierre.letouzey@inria.fr> | 2013-11-22 10:25:58 +0100 |
commit | 1abae19d5688b987b19efba8bcac8577892fcd27 (patch) | |
tree | 185481db06908e0f430ded68c12480f275c3476f /configure | |
parent | a9f32885991263cf17093c6959732a339d473b45 (diff) |
configure: improve last fix
Let's avoid the "if a=$(cmd ...)" since:
- unless being a shell expert, it's not obvious it's testing the exit code
of cmd.
- it's quite fragile, if you pipe cmd into a cmd2 you'll lose the
exit code of cmd.
Instead, we test the emptiness of the variable content afterwards
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -639,10 +639,9 @@ if [ "$coqide_spec" = "yes" -a "$COQIDE" = "no" ]; then else case $lablgtkdir_spec in no) - if lablgtkdirtmp="$(ocamlfind query lablgtk2.sourceview2 2> /dev/null)"; then - # Beware of the final \r in Win32 - # Do not pipe this tr -d above, otherwise the exit code is lost - lablgtkdirtmp="$(echo $lablgtkdirtmp | tr -d '\r')" + # Beware of the final \r in Win32 + lablgtkdirtmp="$(ocamlfind query lablgtk2.sourceview2 2> /dev/null | tr -d '\r')" + if [ "$labgtkdirtmp" != "" ]; then if [ ! -f "$lablgtkdirtmp/gSourceView2.cmi" ]; then echo "Incomplete Lablgtk2 found by ocamlfind (gSourceView2.cmi not found)." elif [ ! -f "$lablgtkdirtmp/glib.mli" ]; then |