[MPlayer-cvslog] r36133 - trunk/configure

[reimar]

Author: reimar
Date: Mon Apr  1 20:14:24 2013
New Revision: 36133

Log:
Revert r36098, it breaks compilation on x86-64 Linux.

The original failure needs to be investigated.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Apr  1 20:12:48 2013	(r36132)
+++ trunk/configure	Mon Apr  1 20:14:24 2013	(r36133)
@@ -2762,14 +2762,6 @@ if test -n "$CPPFLAGS" ; then
 fi
 
 
-echocheck "PIC"
-def_pic='#define CONFIG_PIC 0'
-pic=no
-cpp_condition_check '' 'defined(__PIC__) || defined(__pic__) || defined(PIC)' &&
-  pic=yes && extra_cflags="$extra_cflags -DPIC" && def_pic='#define CONFIG_PIC 1'
-echores $pic
-
-
 # try to create a relocatable binary by default
 echocheck "relocatable binary"
 if test $relocatable = "auto" ; then
@@ -2853,6 +2845,17 @@ if x86_32 ; then
 fi #if x86_32
 
 
+# Check if we need to compile as PIC for this combination of architecture, toolchain,
+# gcc configuration (e.g. hardened or not) and compiler options.
+# Needs to be after the relocatable handling, since PIE changes whether we need PIC or not.
+echocheck "PIC"
+def_pic='#define CONFIG_PIC 0'
+pic=no
+cpp_condition_check '' 'defined(__PIC__) || defined(__pic__) || defined(PIC)' &&
+  pic=yes && extra_cflags="$extra_cflags -DPIC" && def_pic='#define CONFIG_PIC 1'
+echores $pic
+
+
 def_bswap='#define HAVE_BSWAP 0'
 def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
 def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'