summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorjkeil <jkeil@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-07-04 10:45:20 +0000
committerjkeil <jkeil@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-07-04 10:45:20 +0000
commit43cd93e26711efb31622884967f4b1e7d30fd75f (patch)
tree4f38987b6bdcfcdc7064a7b406ef8c999fa47989 /configure
parentb5481a052fe5f0715bdfcbd590a825899ba92458 (diff)
downloadmpv-43cd93e26711efb31622884967f4b1e7d30fd75f.tar.bz2
mpv-43cd93e26711efb31622884967f4b1e7d30fd75f.tar.xz
rework autodetection of assembler used by gcc, the correct assembler is detected
now, in case the user has specified a certain version of the compiler with the "-cc=..." option. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1273 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure24
1 files changed, 19 insertions, 5 deletions
diff --git a/configure b/configure
index f4c9d382bf..be3ed60edb 100755
--- a/configure
+++ b/configure
@@ -6,6 +6,9 @@
#
# Changes in reversed order:
#
+# 2001/07/04 by Juergen Keil
+# - autodetect the assembler binary used by the GCC C compiler
+#
# 2001/07/03 by Nick Kurshev
# - added universal way of configuring SUBDIRS
# - moved configurable stuff of depended SUBDIRS to SUBDIRS
@@ -19,9 +22,14 @@
# 2001/06/04 by Nick Kurshev
# - added hard checking of gcc and soft of assembler
#
-# 2001/05/40 by LGB
+# 2001/05/30 by LGB
# - added --prefix support
#
+# 2001/05/?? by Juergen Keil
+# - autodetect OSS & Sun style audio
+# - cpu feature detection for non-linux x86 systems
+# - converted from bash to bourne shell script
+#
# 2001/05/22 by Nick Kurshev
# - added definition of CPU clone
#
@@ -207,10 +215,7 @@ MCONF='config.mak'
# --- Check for C compiler:
_cc=gcc
-_as=`gcc -print-prog-name=as`
-if [ x"_$as" = x ]; then
- _as=as
-fi
+_as=auto
_x11=auto
_x11libdir=
@@ -309,6 +314,15 @@ echo "YOU'VE SELECTED '--disable-gcc-checking'. PLEASE DON'T SEND US ANY BUGREPO
fi
# ---
+# now that we know what compiler should be used for compilation, try to find
+# out which assembler is used by the $_cc compiler
+if [ "$_as" = auto ]; then
+ _as=`$_cc -print-prog-name=as`
+ if [ "_$as" = "" ]; then
+ _as=as
+ fi
+fi
+
if [ -r /proc/cpuinfo ]; then
# linux with /proc mounted, extract cpu information from it