X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=5d9fc1dd4348175b8b8512bb7e08b51c6cb779d5;hb=300d17c56f089add4ac66120afc4491ad36b3731;hp=f4a31e4ff4ac637d24fb11e701c59703f941b89e;hpb=18e01547aca17f638917f875a312f027d779dff4;p=platform%2Fupstream%2Fflac.git

diff --git a/configure.ac b/configure.ac
index f4a31e4..5d9fc1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,10 +19,11 @@
 # instead of FLAC__ since autoconf triggers off 'AC_' in strings
 
 AC_PREREQ(2.60)
-AC_INIT([flac], [1.2.1])
+AC_INIT([flac], [1.3.0pre2], [flac-dev@xiph.org], [flac], [https://www.xiph.org/flac/])
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/flac/main.c])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([foreign -Wall tar-pax no-dist-gzip dist-xz subdir-objects])
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall tar-pax no-dist-gzip dist-xz subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 user_cflags=$CFLAGS
@@ -39,18 +40,16 @@ AC_PROG_MAKE_SET
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
-AC_CHECK_SIZEOF(void*,0)
+AC_CHECK_SIZEOF([void*])
 AC_SEARCH_LIBS([lround],[m], [AC_DEFINE(HAVE_LROUND,1,lround support)])
-#@@@ new name is AC_CONFIG_HEADERS
-AM_CONFIG_HEADER(config.h)
 
-AC_LANG_PUSH(C++)
+AC_LANG_PUSH([C++])
 # c++ flavor first
 AC_C_VARARRAYS
 if test $ac_cv_c_vararrays = yes; then
 	AC_DEFINE([HAVE_CXX_VARARRAYS], 1, [Define to 1 if C++ supports variable-length arrays.])
 fi
-AC_LANG_POP(C++)
+AC_LANG_POP([C++])
 
 # c flavor
 AC_HEADER_STDC
@@ -59,18 +58,19 @@ AC_C_INLINE
 AC_C_VARARRAYS
 AC_C_TYPEOF
 
-AC_CHECK_HEADERS(stdint.h)
-AC_SUBST(HAVE_STDINT_H)
-AC_CHECK_HEADERS(inttypes.h)
-AC_SUBST(HAVE_INTTYPES_H)
-AC_CHECK_HEADERS(byteswap.h)
-AC_SUBST(HAVE_BYTESWAP_H)
-
-AC_CHECK_HEADERS([sys/param.h])
+AC_CHECK_HEADERS([stdint.h inttypes.h byteswap.h sys/param.h])
 
 XIPH_C_BSWAP32
 
-XIPH_C_FIND_ENDIAN
+ac_cv_c_big_endian=0
+ac_cv_c_little_endian=0
+AC_C_BIGENDIAN([ac_cv_c_big_endian=1], [ac_cv_c_little_endian=1], [
+	AC_MSG_WARN([[*****************************************************************]])
+	AC_MSG_WARN([[*** Not able to determine endian-ness of target processor.       ]])
+	AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in  ]])
+	AC_MSG_WARN([[*** config.h may need to be hand editied.                        ]])
+	AC_MSG_WARN([[*****************************************************************]])
+])
 AC_DEFINE_UNQUOTED(CPU_IS_BIG_ENDIAN, ${ac_cv_c_big_endian},
 					[Target processor is big endian.])
 AC_DEFINE_UNQUOTED(CPU_IS_LITTLE_ENDIAN, ${ac_cv_c_little_endian},
@@ -91,7 +91,7 @@ case "$host_cpu" in
 		AC_DEFINE(FLAC__CPU_IA32)
 		AH_TEMPLATE(FLAC__CPU_IA32, [define if building for ia32/i386])
 		;;
-	powerpc)
+	powerpc|powerpc64)
 		cpu_ppc=true
 		AC_DEFINE(FLAC__CPU_PPC)
 		AH_TEMPLATE(FLAC__CPU_PPC, [define if building for PowerPC])
@@ -357,13 +357,40 @@ fi
 XIPH_GCC_VERSION
 
 if test x$ac_cv_c_compiler_gnu = xyes ; then
+	CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Winline -Wconversion
+	CXXFLAGS="$CXXFLAGS -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
+
+
 	if test x$enable_gcc_werror = "xyes" ; then
-		CFLAGS="-Wall -Wextra -Werror $CFLAGS"
-		CXXFLAGS="-Wall -Wextra -Werror $CXXFLAGS"
+		CFLAGS="$CFLAGS -Wall -Wextra -Werror "
+		CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror "
+		fi
+
+	if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then
+		CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR"
+		CFLAGS="$CFLAGS -fvisibility=hidden"
+		CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+		fi
+
+	if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then
+		XIPH_ADD_CFLAGS([-fgnu89-inline])
 		fi
 	fi
 
 
+XIPH_ADD_CFLAGS([-Wextra])
+XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
+XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
+
+case "$host_os" in
+	mingw32msvc | mingw32 | freebsd* )
+		# Stack protector not working on these platforms 2013/03/09.
+		;;
+	*)
+		XIPH_ADD_CFLAGS([-fstack-protector --param ssp-buffer-size=4])
+		;;
+	esac
+
 #@@@
 AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")
 AM_CONDITIONAL(FLaC__HAS_GAS__TEMPORARILY_DISABLED, test "yes" = "no")
@@ -425,6 +452,7 @@ AC_CONFIG_FILES([ \
 	include/share/Makefile \
 	include/share/grabbag/Makefile \
 	include/test_libs_common/Makefile \
+	doc/Doxyfile \
 	doc/Makefile \
 	doc/html/Makefile \
 	doc/html/images/Makefile \
@@ -438,13 +466,13 @@ AC_CONFIG_FILES([ \
 	test/metaflac-test-files/Makefile \
 	test/pictures/Makefile \
 	build/Makefile \
-	obj/Makefile \
-	obj/debug/Makefile \
-	obj/debug/bin/Makefile \
-	obj/debug/lib/Makefile \
-	obj/release/Makefile \
-	obj/release/bin/Makefile \
-	obj/release/lib/Makefile \
+	objs/Makefile \
+	objs/debug/Makefile \
+	objs/debug/bin/Makefile \
+	objs/debug/lib/Makefile \
+	objs/release/Makefile \
+	objs/release/bin/Makefile \
+	objs/release/lib/Makefile \
 ])
 AC_OUTPUT
 
@@ -460,7 +488,8 @@ AC_MSG_RESULT([
     Host OS : ............................. ${host_os}
 ])
 
-if test x$ac_cv_c_compiler_gnu = xyes ; then
 	echo "    Compiler is GCC : ..................... ${ac_cv_c_compiler_gnu}"
+if test x$ac_cv_c_compiler_gnu = xyes ; then
 	echo "    GCC version : ......................... ${GCC_VERSION}"
-	fi
+fi
+echo