|author||Guy Harris <firstname.lastname@example.org>||2013-08-12 17:16:08 +0000|
|committer||Guy Harris <email@example.com>||2013-08-12 17:16:08 +0000|
Use "command -v", required by recent POSIX, rather than "which"; I seem
to remember this being suggested relatively recently on some mailing list (either one of the Wireshark lists or tcpdump-workers, I think). Handle systems where /usr/X11R6/bin is a symlink to /usr/bin and where the user running autogen.sh has /usr/X11R6/bin before /usr/bin in their $PATH. svn path=/trunk/; revision=51315
Diffstat (limited to 'aclocal-flags')
1 files changed, 14 insertions, 2 deletions
diff --git a/aclocal-flags b/aclocal-flags
index 77a5cd1571..e8a4209d07 100755
@@ -48,11 +48,12 @@ aclocal_dir=`aclocal --print-ac-dir`
# And where do we want to make sure it looks?
# Look for pkg-config first.
-pkg_config_path=`which pkg-config 2>/dev/null`
+pkg_config_path=`command -v pkg-config 2>/dev/null`
if [ -z "$pkg_config_path" ]
- # Either we don't have "which" or it didn't find pkg-config.
+ # Either we don't have "command" (which is required by recent
+ # POSIX) or it didn't find pkg-config.
@@ -73,9 +74,20 @@ else
# it in /usr/ccs/bin, but there's no /usr/ccs/share.
# Map /usr/ccs to /usr.
+ # Ubuntu 7.10 has /usr/X11R6/bin as a symbolic link
+ # to /usr/bin, but there's no /usr/X11R6/share. If
+ # /usr/X11R6/bin is a symlink to /usr/bin, map
+ # /usr/X11R6 to /usr.
if [ "$pkg_config_prefix" = /usr/ccs ]
+ elif [ "$pkg_config_prefix" = /usr/X11R6 ]
+ if expr "`ls -ld /usr/X11R6/bin`" : '.*/usr/X11R6/bin -> .*/bin$' >/dev/null