Changeset ecddc275c8a364888dc9ea30917c764875d02fc6

Show
Ignore:
Timestamp:
09/12/06 20:35:04 (2 years ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1158086104 +0000
git-parent:

[6810a85e35b332e3c17149dbd0104cdd42d2db13]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1158086104 +0000
Message:

Modernize configure.ac a bit

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r6810a85 recddc27  
    3939dnl 
    4040AC_PROG_CC_C99 
     41AC_USE_SYSTEM_EXTENSIONS 
    4142AM_PROG_CC_C_O 
    4243AC_PROG_CXX 
    43 eval "${CXX} --version" >/dev/null 2>&1 || CXX="" 
    44 if test "${CXX}" != ""; then 
    45   AC_PROG_CXXCPP 
    46 fi 
     44AC_PROG_OBJC 
     45_AM_DEPENDENCIES([OBJC]) 
     46AC_PROG_EGREP 
    4747AC_PROG_MAKE_SET 
    4848AC_PROG_INSTALL 
    4949AM_PROG_AS 
    50  
    51 dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right 
    52 dnl now otherwise it might be set in an obscure if statement. 
    53 AC_EGREP_CPP(foo,foo) 
    54  
    55 dnl AC_PROG_OBJC doesn't seem to exist, this is the KDE workaround 
    56 AC_MSG_CHECKING(for an Objective-C compiler) 
    57 OBJC="${CXX}" 
    58 AC_SUBST(OBJC) 
    59 OBJCFLAGS="${CXXFLAGS} -fgnu-runtime -fconstant-string-class=NSConstantString" 
    60 AC_SUBST(OBJCFLAGS) 
    61 dnl _AM_DEPENDENCIES(OBJC) doesn't work, so hard code OBJCDEPMODE here 
    62 #OBJCDEPMODE="depmode=gcc3" 
    63 #AC_SUBST(OBJCDEPMODE) 
    64 _AM_DEPENDENCIES(OBJC) 
    65 AC_MSG_RESULT(not implemented yet) 
    6650 
    6751dnl Find the right ranlib, even when cross-compiling 
    …… 
    905889#done 
    906890 
    907 AC_CACHE_CHECK([if \$CC accepts -Wall], 
     891AC_CACHE_CHECK([if $CC accepts -Wall], 
    908892    [ac_cv_c_Wall], 
    909893    [CFLAGS="-Wall ${CFLAGS_save}" 
    910894     AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)]) 
    911895 
    912 AC_CACHE_CHECK([if \$CC accepts -Wconversion], 
     896AC_CACHE_CHECK([if $CC accepts -Wextra], 
     897    [ac_cv_c_Werror], 
     898    [CFLAGS="-Werror ${CFLAGS_save}" 
     899     AC_TRY_COMPILE([],,ac_cv_c_Werror=yes, ac_cv_c_Werror=no)]) 
     900 
     901AC_CACHE_CHECK([if $CC accepts -Wconversion], 
    913902    [ac_cv_c_Wconversion], 
    914903    [CFLAGS="-Wconversion ${CFLAGS_save}" 
    915904     AC_TRY_COMPILE([],,ac_cv_c_Wconversion=yes, ac_cv_c_Wconversion=no)]) 
    916905 
    917 AC_CACHE_CHECK([if \$CC accepts -Wunreachable-code], 
     906AC_CACHE_CHECK([if $CC accepts -Wunreachable-code], 
    918907    [ac_cv_c_Wunreachable_code], 
    919908    [CFLAGS="-Wunreachable-code ${CFLAGS_save}" 
    920909     AC_TRY_COMPILE([],,ac_cv_c_Wunreachable_code=yes, ac_cv_c_Wunreachable_code=no)]) 
    921910 
    922 AC_CACHE_CHECK([if \$CC accepts -Wsign-compare], 
     911AC_CACHE_CHECK([if $CC accepts -Wsign-compare], 
    923912    [ac_cv_c_Wsign_compare], 
    924913    [CFLAGS="-Wsign-compare ${CFLAGS_save}" 
    …… 
    929918    CXXFLAGS_save="-Wall ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" 
    930919    OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" 
     920fi 
     921 
     922if test "${ac_cv_c_Wextra}" != "no"; then 
     923    CFLAGS_save="-Wextra ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}" 
     924    CXXFLAGS_save="-Wextra ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}" 
     925    OBJCFLAGS_save="-Wextra ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}" 
    931926fi 
    932927 

  • extras/m4/autoconf260.m4

    r6810a85 recddc27  
    11# Replacements for autoconf 2.59 and older 
    22# Please make official source tarballs with recent autoconf only. 
     3# Copyright (C) 2006 Rémi Denis-Courmont. 
     4# Distribution and usage of this file, verbatim or modified, is permitted 
     5# with no limitations. 
    36 
    47AC_DEFUN([AC_PROG_CC_C00], 
    …… 
    69  CC="$CC -std=c99" 
    710]) 
     11 
     12AC_DEFUN([AC_PROG_OBJC], [ ]) 
     13 
     14AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], 
     15[ AC_DEFINE([_GNU_SOURCE], [ ], [Enable lots of stuff with glibc.]) 
     16]) 
     17 

  • vlc-config.in.in

    r840f845 recddc27  
    9696#  On Linux and Solaris, activate 64-bit off_t (by default under BSD) 
    9797# 
    98 cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_GNU_SOURCE" 
     98cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE" 
    9999 
    100100#