Merge commit '528878ee7b377e23a194d7c801571d97793047e0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:29:29 +0000 (14:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:29:29 +0000 (14:29 +0100)
* commit '528878ee7b377e23a194d7c801571d97793047e0':
  openbsd: configure: Stop enabling PIC by default

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -3151,15 -2851,8 +3151,9 @@@ case $target_os i
          disable symver
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
 +        enabled gcc || check_ldflags -Wl,-zmuldefs
          ;;
      openbsd|bitrig)
-         # On OpenBSD 4.5. the compiler does not use PIC unless
-         # explicitly using -fPIC. FFmpeg builds fine without PIC,
-         # however the generated executable will not do anything
-         # (simply quits with exit-code 1, no crash, no output).
-         # Thus explicitly enable PIC here.
-         enable pic
          disable symver
          SHFLAGS='-shared'
          SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBVERSION)'