summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-03-09 23:29:11 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-03-09 23:29:11 +0000
commit9d2dda92c49a3e1ce59f174ce4d62b670fb60295 (patch)
tree395da159c1b4b36468966d5709bc0063cd469d0d
parent2a8f6c603154dd97d4aa82a649d66e3b0156a79d (diff)
downloadxine-lib-9d2dda92c49a3e1ce59f174ce4d62b670fb60295.tar.gz
xine-lib-9d2dda92c49a3e1ce59f174ce4d62b670fb60295.tar.bz2
Check for chost-specific strings command during ./configure rather than on makefile; also use -a option to scan the whole file, for Solaris compatibility. Suggested by patch from Albert Lee.
CVS patchset: 8645 CVS date: 2007/03/09 23:29:11
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index fcd4768d8..bdf854fab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,11 +78,9 @@ slackbuild:
PREFIX="/usr" misc/SlackBuild
-STRINGS=$(shell which -- "${CHOST}-strings" 2>/dev/null || which strings 2>/dev/null || false)
-
install-exec-hook:
find $(top_builddir) -name \*.so | \
- xargs $(STRINGS) | \
+ xargs $(STRINGS) -a | \
egrep '^([-a-z]+/[-+.a-z0-9]+:[^:]+:[^;]+;[ \t]*)+' | \
sed -e 's/:[^;]\+;/\n/g' | \
sort -u | \
diff --git a/configure.ac b/configure.ac
index 3969cedd2..4418cb841 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,7 @@ AC_PROG_LN_S
AC_PROG_AWK
AC_C_INLINE
+AC_CHECK_TOOL([STRINGS], [strings], [false])
dnl ---------------------------------------------
dnl Check for assembler (ffmpeg need it), don't call this before LIBTOOL