X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=b4c5c935424208d38d1317b52d4f0cdaea355b77;hb=0a2b901e99bc90216303d4c897e1944f5c31f622;hp=37e561096f975ef551585b68e9ffafdc9a362bce;hpb=238b2676c29df0477e6ec989977359c412f3d492;p=platform%2Fupstream%2Fflac.git

diff --git a/configure.ac b/configure.ac
index 37e5610..b4c5c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,23 +18,21 @@
 # NOTE that for many of the AM_CONDITIONALs we use the prefix FLaC__
 # instead of FLAC__ since autoconf triggers off 'AC_' in strings
 
-AC_INIT(src/flac/main.c)
-AM_INIT_AUTOMAKE(flac, 1.2.1)
+AC_PREREQ(2.60)
+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 1.11 -Wall tar-pax no-dist-gzip dist-xz subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-# Enable the generation of shared libraries under Win32
-AC_LIBTOOL_WIN32_DLL
-
-# We need two libtools, one that builds both shared and static, and
-# one that builds only static.  This is because the resulting libtool
-# does not allow us to choose which to build at runtime.
-AM_PROG_LIBTOOL
-sed -e 's/^build_old_libs=yes/build_old_libs=no/' libtool > libtool-disable-static
-chmod +x libtool-disable-static
-
-AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
-AC_CONFIG_MACRO_DIR([m4])
+user_cflags=$CFLAGS
 
+#Prefer whatever the current ISO standard is.
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+LT_INIT([win32-dll disable-static pic-only])
 AM_PROG_AS
 AC_PROG_CXX
 AC_PROG_MAKE_SET
@@ -42,34 +40,37 @@ AC_PROG_MAKE_SET
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
-AC_CHECK_SIZEOF(void*,0)
-
-#@@@ new name is AC_CONFIG_HEADERS
-AM_CONFIG_HEADER(config.h)
+AC_CHECK_SIZEOF([void*])
+AC_SEARCH_LIBS([lround],[m], [AC_DEFINE(HAVE_LROUND,1,lround support)])
 
-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
+AM_PROG_CC_C_O
 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([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},
@@ -90,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])
@@ -298,8 +299,9 @@ fi
 
 AM_CONDITIONAL(FLaC__HAS_OGG, [test "x$have_ogg" = xyes])
 if test "x$have_ogg" = xyes ; then
-AC_DEFINE(FLAC__HAS_OGG)
-AH_TEMPLATE(FLAC__HAS_OGG, [define if you have the ogg library])
+	AC_DEFINE_UNQUOTED([FLAC__HAS_OGG],1,[define if you have the ogg library])
+else
+	AC_DEFINE_UNQUOTED([FLAC__HAS_OGG],0)
 fi
 
 dnl check for i18n(internationalization); these are from libiconv/gettext
@@ -340,18 +342,15 @@ AC_DEFINE(FLAC__HAS_GAS)
 AH_TEMPLATE(FLAC__HAS_GAS, [define if you are compiling for PowerPC and have the 'gas' assembler])
 fi
 
-CPPFLAGS='-I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include'" $CPPFLAGS"
 if test "x$debug" = xtrue; then
-	CPPFLAGS="-DDEBUG -DFLaC__INLINE= $CPPFLAGS"
+	CPPFLAGS="-DDEBUG $CPPFLAGS"
 	CFLAGS="-g $CFLAGS"
 else
 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
-	# $ac_cv_c_inline from AC_C_INLINE
-	if test "x$ac_cv_c_inline" != xno ; then
-		CPPFLAGS="-DFLaC__INLINE=$ac_cv_c_inline $CPPFLAGS"
-	fi
 	if test "x$GCC" = xyes; then
-		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
+		if test "x$user_cflags" = x; then
+			CFLAGS="-O3 -funroll-loops -Wall -W -Winline"
+		fi
 	fi
 fi
 
@@ -359,12 +358,34 @@ XIPH_GCC_VERSION
 
 if test x$ac_cv_c_compiler_gnu = xyes ; then
 	if test x$enable_gcc_werror = "xyes" ; then
-		CFLAGS="-Werror $CFLAGS"
-		CXXFLAGS="-Werror $CXXFLAGS"
+		CFLAGS="-Wall -Wextra -Werror $CFLAGS"
+		CXXFLAGS="-Wall -Wextra -Werror $CXXFLAGS"
+		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([-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")
@@ -426,6 +447,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 \
@@ -439,13 +461,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
 
@@ -461,7 +483,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