comparison configure @ 28668:838f5706f17e

configure: Make the special dvdnav test the last one again The libdvdnav linker flag handling is hacky and can add flags that make any compile attempt using them fail unless MPlayer's internal dvdread has been compiled and is linked as a part of the resulting binary. For this reason no more tests using the common flags can be performed after the flags from the dvdnav test have been added. However the dvdnav test was no longer the last one despite some warning comments. Move it back to the last position and make the warnings a bit more explicit.

28667:8363a6c42ace

  def_maemo='#undef CONFIG_MAEMO'
fi
echores "$_maemo"
fi

#this must be the last test to be performed or the ones following it will likely fail
#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer
# to use its own copy of the library)
echocheck "DVD support (libdvdnav)"
dvdnav_internal=no
if test "$_dvdnav" = auto ; then
  if test "$_dvdread_internal" = yes ; then
    _dvdnav=yes

  def_dvdnav='#undef CONFIG_DVDNAV'
  _noinputmodules="dvdnav $_noinputmodules"
fi
echores "$_dvdnav"


#############################################################################

# On OS/2 nm supports only a.out. So the -Zomf compiler option to generate
# the OMF format needs to come after the 'extern symbol prefix' check, which
# uses nm.
if os2 ; then
  _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
fi

# linker paths should be the same for mencoder and mplayer
_ld_tmp=""
for I in $_libs_mplayer ; do
  _tmp=`echo $I | sed -e 's/^-L.*$//'`
  if test -z "$_tmp" ; then
    _ld_extra="$_ld_extra $I"
  else
    _ld_tmp="$_ld_tmp $I"
  fi
done
_libs_mplayer=$_ld_tmp


#############################################################################
if darwin ; then
  CFLAGS="$CFLAGS -mdynamic-no-pic -falign-loops=16 -shared-libgcc"
  if [ "$_cc_major" = 3 ] && [ "$_cc_minor" -lt 1 ]; then
    CFLAGS="$CFLAGS -no-cpp-precomp"
  fi
fi
if amigaos ; then
  CFLAGS="$CFLAGS -DNEWLIB -D__USE_INLINE__"
fi
# Thread support
if linux ; then
  CFLAGS="$CFLAGS -D_REENTRANT"
elif freebsd || netbsd || openbsd || bsdos ; then
  # FIXME bsd needs this so maybe other OS'es
  CFLAGS="$CFLAGS -D_THREAD_SAFE"
fi
# 64 bit file offsets?
if test "$_largefiles" = yes || freebsd ; then
  CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  if test "$_dvdread" = yes || test "$_libdvdcss_internal" = yes ; then
    # dvdread support requires this (for off64_t)
    CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
  fi
fi

CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"

cat > $TMPC << EOF
int main(void) { return 0; }
EOF
if test "$cc_vendor" = "gnu" ; then
  cc_check -std=gnu99 && CFLAGS="-std=gnu99 $CFLAGS"
  cc_check -Wdeclaration-after-statement && CFLAGS="-Wdeclaration-after-statement $CFLAGS"
  cc_check -Wno-pointer-sign && CFLAGS="-Wno-pointer-sign $CFLAGS"
  cc_check -Wdisabled-optimization && CFLAGS="-Wdisabled-optimization $CFLAGS"
  cc_check -Wundef && CFLAGS="-Wundef $CFLAGS"
else
  CFLAGS="-D_ISOC99_SOURCE -D_BSD_SOURCE $CFLAGS"
fi

cc_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer"

#############################################################################
echo "Creating config.mak"
cat > config.mak << EOF
# -------- Generated by configure -----------

28668:838f5706f17e

  def_maemo='#undef CONFIG_MAEMO'
fi
echores "$_maemo"
fi

#############################################################################

# On OS/2 nm supports only a.out. So the -Zomf compiler option to generate
# the OMF format needs to come after the 'extern symbol prefix' check, which
# uses nm.
if os2 ; then
  _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild"
fi

# linker paths should be the same for mencoder and mplayer
_ld_tmp=""
for I in $_libs_mplayer ; do
  _tmp=`echo $I | sed -e 's/^-L.*$//'`
  if test -z "$_tmp" ; then
    _ld_extra="$_ld_extra $I"
  else
    _ld_tmp="$_ld_tmp $I"
  fi
done
_libs_mplayer=$_ld_tmp


#############################################################################
if darwin ; then
  CFLAGS="$CFLAGS -mdynamic-no-pic -falign-loops=16 -shared-libgcc"
  if [ "$_cc_major" = 3 ] && [ "$_cc_minor" -lt 1 ]; then
    CFLAGS="$CFLAGS -no-cpp-precomp"
  fi
fi
if amigaos ; then
  CFLAGS="$CFLAGS -DNEWLIB -D__USE_INLINE__"
fi
# Thread support
if linux ; then
  CFLAGS="$CFLAGS -D_REENTRANT"
elif freebsd || netbsd || openbsd || bsdos ; then
  # FIXME bsd needs this so maybe other OS'es
  CFLAGS="$CFLAGS -D_THREAD_SAFE"
fi
# 64 bit file offsets?
if test "$_largefiles" = yes || freebsd ; then
  CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
  if test "$_dvdread" = yes || test "$_libdvdcss_internal" = yes ; then
    # dvdread support requires this (for off64_t)
    CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
  fi
fi

CXXFLAGS=" $CFLAGS -D__STDC_LIMIT_MACROS"

cat > $TMPC << EOF
int main(void) { return 0; }
EOF
if test "$cc_vendor" = "gnu" ; then
  cc_check -std=gnu99 && CFLAGS="-std=gnu99 $CFLAGS"
  cc_check -Wdeclaration-after-statement && CFLAGS="-Wdeclaration-after-statement $CFLAGS"
  cc_check -Wno-pointer-sign && CFLAGS="-Wno-pointer-sign $CFLAGS"
  cc_check -Wdisabled-optimization && CFLAGS="-Wdisabled-optimization $CFLAGS"
  cc_check -Wundef && CFLAGS="-Wundef $CFLAGS"
else
  CFLAGS="-D_ISOC99_SOURCE -D_BSD_SOURCE $CFLAGS"
fi

cc_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer"

# This must be the last test to be performed. Any other tests following it
# could fail due to linker errors. libdvdnavmini is intentionally not linked
# against libdvdread (to permit MPlayer to use its own copy of the library).
# So any compilation using the flags added here but not linking against
# libdvdread can fail.
echocheck "DVD support (libdvdnav)"
dvdnav_internal=no
if test "$_dvdnav" = auto ; then
  if test "$_dvdread_internal" = yes ; then
    _dvdnav=yes

  def_dvdnav='#undef CONFIG_DVDNAV'
  _noinputmodules="dvdnav $_noinputmodules"
fi
echores "$_dvdnav"

# DO NOT ADD ANY TESTS THAT USE LINKER FLAGS HERE (like cc_check).
# Read dvdnav comment above.

#############################################################################
echo "Creating config.mak"
cat > config.mak << EOF
# -------- Generated by configure -----------