remove centos 5 as option, include more warnings by default, but righ…

…t not having trouble w/Werror
danchang · Dec 2, 2011 · 890690b · 890690b
1 parent 8402c0c
commit 890690b
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 47 deletions.
diff --git a/config/sipXlib.m4 b/config/sipXlib.m4
@@ -26,21 +26,10 @@ AC_DEFUN([SFAC_INIT_FLAGS],
     if test x_"${ax_cv_c_compiler_vendor}" = x_gnu
     then
     	SF_CXX_C_FLAGS="-D__pingtel_on_posix__ -D_linux_ -D_REENTRANT -D_FILE_OFFSET_BITS=64 -fmessage-length=0"
-    	SF_CXX_WARNINGS="-Wall -Wformat -Wwrite-strings -Wpointer-arith"
+    	SF_CXX_WARNINGS="-Wall -Wformat -Wwrite-strings -Wpointer-arith -Wno-strict-aliasing -fno-strict-aliasing -Wno-unused-result -fno-strict-aliasing"
     	CXXFLAGS="$CXXFLAGS $SF_CXX_C_FLAGS $SF_CXX_WARNINGS"
     	CFLAGS="$CFLAGS $SF_CXX_C_FLAGS $SF_CXX_WARNINGS -Wnested-externs -Wmissing-declarations -Wmissing-prototypes"
 
-      # the sfac_strict_compile flag is set by SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
-      AC_MSG_CHECKING(how to treat compilation warnings)
-      if test x$sfac_strict_compile = xstrictmode 
-      then 
-         AC_MSG_RESULT([strict mode - treat as errors])
-         CXXFLAGS="$CXXFLAGS -Wno-strict-aliasing -fno-strict-aliasing -Werror"
-         CFLAGS="$CXXFLAGS -Wno-strict-aliasing -fno-strict-aliasing -Werror"
-      else 
-         AC_MSG_RESULT([normal mode - allow warnings])
-      fi
-
     elif test x_"${ax_cv_c_compiler_vendor}" = x_sun
     then
         SF_CXX_C_FLAGS="-D__pingtel_on_posix__ -D_REENTRANT -D_FILE_OFFSET_BITS=64 -mt -fast -v"
@@ -105,25 +94,6 @@ AC_DEFUN([SFAC_SIPX_GLOBAL_OPTS],
     ENABLE_PROFILE
 ])
 
-dnl If SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED is included in configure.ac,
-dnl   then the default behavior is to treat all gcc warnings as errors.
-dnl This can be temporarily disabled by using --disable-compile-strict
-dnl If used, this macro must be before SFAC_INIT_FLAGS in configure.ac
-AC_DEFUN([SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED],[
-   AC_BEFORE([$0], [SFAC_INIT_FLAGS])dnl 
-
-   AC_ARG_ENABLE([compile-strict],
-     AC_HELP_STRING([--enable-compile-strict],
-       [When enabled, treat all compiler warnings as errors - default is to disallow warnings]),
-     [if test x$enable_compile_strict = xyes 
-      then sfac_strict_compile=strictmode
-      else sfac_strict_compile=allowmode
-      fi
-     ], 
-     [sfac_strict_compile=strictmode]
-   )
-])
-
 ## Check to see that we are using the minimum required version of automake
 AC_DEFUN([SFAC_AUTOMAKE_VERSION],[
    AC_MSG_CHECKING(for automake version >= $1)

diff --git a/mak/rpm.m4 b/mak/rpm.m4
@@ -55,9 +55,9 @@ AC_CHECK_FILE(/bin/rpm,
 ])
 
 AC_ARG_VAR(DISTRO, [What operating system you are compiling for. Default is ${DistroDefault}])
-test -n "${DISTRO}" || DISTRO="${DistroDefault:-centos-5-i386}"
+test -n "${DISTRO}" || DISTRO="${DistroDefault:-centos-6-x86_64}"
 
-AllDistrosDefault="centos-5-i386 centos-5-x86_64 fedora-14-i386 fedora-14-x86_64 centos-6-i386 centos-6-x86_64"
+AllDistrosDefault="fedora-14-i386 fedora-14-x86_64 centos-6-i386 centos-6-x86_64"
 AC_ARG_VAR(ALL_DISTROS, [All distros which using cross distroy compiling (xc.* targets) Default is ${AllDistrosDefault}])
 test -n "${ALL_DISTROS}" || ALL_DISTROS="${AllDistrosDefault}"
 
@@ -112,8 +112,6 @@ AC_ARG_ENABLE(rpm, [--enable-rpm Using mock package to build rpms],
 
   AC_CONFIG_FILES([mak/mock/logging.ini])
   AC_CONFIG_FILES([mak/mock/site-defaults.cfg])
-  AC_CONFIG_FILES([mak/mock/centos-5-i386.cfg])
-  AC_CONFIG_FILES([mak/mock/centos-5-x86_64.cfg])
   AC_CONFIG_FILES([mak/mock/centos-6-i386.cfg])
   AC_CONFIG_FILES([mak/mock/centos-6-x86_64.cfg])
   AC_CONFIG_FILES([mak/mock/fedora-14-i386.cfg])

diff --git a/sipXexample/configure.ac b/sipXexample/configure.ac
@@ -13,7 +13,6 @@ AC_PROG_LIBTOOL
 AC_PROG_CXX
 AC_PROG_CC
 AX_COMPILER_VENDOR
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_COMMSERVER
 

diff --git a/sipXmediaAdapterLib/configure.ac b/sipXmediaAdapterLib/configure.ac
@@ -15,7 +15,6 @@ CHECK_LIBRT
 CHECK_CPPUNIT
 CHECK_PCRE
 CHECK_SSL
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_MEDIA
 CHECK_GIPSNEQ

diff --git a/sipXmediaLib/configure.ac b/sipXmediaLib/configure.ac
@@ -15,7 +15,6 @@ AC_PROG_CC
 CHECK_XARGS_REPLACE
 CHECK_COREAUDIO
 CHECK_CPPUNIT
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_STACK
 SFAC_FEATURE_SIP_TLS

diff --git a/sipXpark/configure.ac b/sipXpark/configure.ac
@@ -14,7 +14,6 @@ AX_COMPILER_VENDOR
 AC_PROG_CC
 CHECK_XARGS_REPLACE
 CHECK_XARGS_REPLACE
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_COMMSERVER
 SFAC_LIB_CALL

diff --git a/sipXportLib/configure.ac b/sipXportLib/configure.ac
@@ -23,7 +23,6 @@ AC_SEARCH_LIBS([dlopen], [dl])
 CHECK_CPPUNIT
 CHECK_PCRE
 CHECK_SSL
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_FEATURE_SIP_TLS
 AC_MSG_CHECKING(for system type for process iterator ($host))

diff --git a/sipXpresence/configure.ac b/sipXpresence/configure.ac
@@ -13,7 +13,6 @@ AC_PROG_CXX
 AX_COMPILER_VENDOR
 AC_PROG_CC
 CHECK_XARGS_REPLACE
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_COMMSERVER
 SFAC_LIB_CALL

diff --git a/sipXproxy/configure.ac b/sipXproxy/configure.ac
@@ -14,7 +14,6 @@ AX_COMPILER_VENDOR
 AC_PROG_CC
 CHECK_XARGS_REPLACE
 AM_CONDITIONAL(IS_RPMBUILD, test x$enable_rpmbuild = xyes)
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_COMMSERVER
 SFAC_FEATURE_SIP_TLS

diff --git a/sipXrls/configure.ac b/sipXrls/configure.ac
@@ -13,7 +13,6 @@ AC_PROG_CXX
 AX_COMPILER_VENDOR
 AC_PROG_CC
 CHECK_XARGS_REPLACE
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_COMMSERVER
 SFAC_LIB_CALL

diff --git a/sipXsaa/configure.ac b/sipXsaa/configure.ac
@@ -3,7 +3,6 @@ AC_INIT(sipXsaa, 0.0.4.5.2, [email protected])
 AC_CONFIG_AUX_DIR(config)
 m4_include([config/general.m4])
 m4_include([config/sipXlib.m4])
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 AM_INIT_AUTOMAKE(foreign tar-ustar)
 SFAC_AUTOMAKE_VERSION([1.6])
 AM_CONFIG_HEADER([src/config.h])

diff --git a/sipXsupervisor/configure.ac b/sipXsupervisor/configure.ac
@@ -3,7 +3,6 @@ AC_INIT(sipXsupervisor, 0.0.4.5.2, [email protected])
 AC_CONFIG_AUX_DIR(config)
 m4_include([config/general.m4])
 m4_include([config/sipXlib.m4])
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 AM_INIT_AUTOMAKE(foreign tar-ustar)
 SFAC_AUTOMAKE_VERSION([1.6])
 AC_CONFIG_SRCDIR([src/sipXsupervisor.cpp])

diff --git a/sipXtackLib/configure.ac b/sipXtackLib/configure.ac
@@ -28,7 +28,6 @@ fi
 
 CHECK_CPPUNIT
 CHECK_SSL
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 SFAC_LIB_PORT
 SFAC_FEATURE_SIP_TLS

diff --git a/sipXzmqLib/configure.ac b/sipXzmqLib/configure.ac
@@ -23,7 +23,6 @@ AC_SEARCH_LIBS([dlopen], [dl])
 CHECK_CPPUNIT
 CHECK_PCRE
 CHECK_SSL
-SFAC_STRICT_COMPILE_NO_WARNINGS_ALLOWED
 SFAC_INIT_FLAGS
 AC_CHECK_FUNCS(setenv)
 AC_CONFIG_FILES([