From: Rémi Denis-Courmont <rem@videolan.org>
Date: Tue, 12 Sep 2006 18:35:04 +0000 (+0000)
Subject: Modernize configure.ac a bit
X-Git-Tag: 0.9.0-test0~10323
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ecddc275c8a364888dc9ea30917c764875d02fc6;p=vlc

Modernize configure.ac a bit
---

diff --git a/configure.ac b/configure.ac
index c27cb7f5c9..b2ea7856dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,32 +38,16 @@ dnl
 dnl Check for tools
 dnl
 AC_PROG_CC_C99
+AC_USE_SYSTEM_EXTENSIONS
 AM_PROG_CC_C_O
 AC_PROG_CXX
-eval "${CXX} --version" >/dev/null 2>&1 || CXX=""
-if test "${CXX}" != ""; then
-  AC_PROG_CXXCPP
-fi
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
+AC_PROG_EGREP
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
 AM_PROG_AS
 
-dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
-dnl now otherwise it might be set in an obscure if statement.
-AC_EGREP_CPP(foo,foo)
-
-dnl AC_PROG_OBJC doesn't seem to exist, this is the KDE workaround
-AC_MSG_CHECKING(for an Objective-C compiler)
-OBJC="${CXX}"
-AC_SUBST(OBJC)
-OBJCFLAGS="${CXXFLAGS} -fgnu-runtime -fconstant-string-class=NSConstantString"
-AC_SUBST(OBJCFLAGS)
-dnl _AM_DEPENDENCIES(OBJC) doesn't work, so hard code OBJCDEPMODE here
-#OBJCDEPMODE="depmode=gcc3"
-#AC_SUBST(OBJCDEPMODE)
-_AM_DEPENDENCIES(OBJC)
-AC_MSG_RESULT(not implemented yet)
-
 dnl Find the right ranlib, even when cross-compiling
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
@@ -904,22 +888,27 @@ fi
 #    fi
 #done
 
-AC_CACHE_CHECK([if \$CC accepts -Wall],
+AC_CACHE_CHECK([if $CC accepts -Wall],
     [ac_cv_c_Wall],
     [CFLAGS="-Wall ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wall=yes, ac_cv_c_Wall=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wconversion],
+AC_CACHE_CHECK([if $CC accepts -Wextra],
+    [ac_cv_c_Werror],
+    [CFLAGS="-Werror ${CFLAGS_save}"
+     AC_TRY_COMPILE([],,ac_cv_c_Werror=yes, ac_cv_c_Werror=no)])
+
+AC_CACHE_CHECK([if $CC accepts -Wconversion],
     [ac_cv_c_Wconversion],
     [CFLAGS="-Wconversion ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wconversion=yes, ac_cv_c_Wconversion=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wunreachable-code],
+AC_CACHE_CHECK([if $CC accepts -Wunreachable-code],
     [ac_cv_c_Wunreachable_code],
     [CFLAGS="-Wunreachable-code ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wunreachable_code=yes, ac_cv_c_Wunreachable_code=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wsign-compare],
+AC_CACHE_CHECK([if $CC accepts -Wsign-compare],
     [ac_cv_c_Wsign_compare],
     [CFLAGS="-Wsign-compare ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
@@ -930,6 +919,12 @@ if test "${ac_cv_c_Wall}" != "no"; then
     OBJCFLAGS_save="-Wall ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
 fi
 
+if test "${ac_cv_c_Wextra}" != "no"; then
+    CFLAGS_save="-Wextra ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
+    CXXFLAGS_save="-Wextra ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
+    OBJCFLAGS_save="-Wextra ${OBJCFLAGS_save}"; OBJCFLAGS="${OBJCFLAGS_save}"
+fi
+
 if test "${ac_cv_c_Wsign_compare}" != "no"; then
     CFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CFLAGS="${CFLAGS_save}"
     CXXFLAGS_save="-Wsign-compare ${CFLAGS_save}"; CXXFLAGS="${CXXFLAGS_save}"
diff --git a/extras/m4/autoconf260.m4 b/extras/m4/autoconf260.m4
index e7f48e2d41..5c120ff532 100644
--- a/extras/m4/autoconf260.m4
+++ b/extras/m4/autoconf260.m4
@@ -1,7 +1,17 @@
 # Replacements for autoconf 2.59 and older
 # Please make official source tarballs with recent autoconf only.
+# Copyright (C) 2006 Rémi Denis-Courmont.
+# Distribution and usage of this file, verbatim or modified, is permitted
+# with no limitations.
 
 AC_DEFUN([AC_PROG_CC_C00],
 [ AC_REQUIRE([AC_PROG_CC])dnl
   CC="$CC -std=c99"
 ])
+
+AC_DEFUN([AC_PROG_OBJC], [ ])
+
+AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+[ AC_DEFINE([_GNU_SOURCE], [ ], [Enable lots of stuff with glibc.])
+])
+
diff --git a/vlc-config.in.in b/vlc-config.in.in
index 5589d1c536..b65f47871f 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -95,7 +95,7 @@ linkage="c"
 #
 #  On Linux and Solaris, activate 64-bit off_t (by default under BSD)
 #
-cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_GNU_SOURCE"
+cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE"
 
 #
 #  Gettext, data and plugin location