Diff of /branches/release-1_3-branch/xvidcore/build/generic/configure.in

	revision 2043, Mon Sep 19 09:32:53 2011 UTC	revision 2067, Mon Feb 18 16:24:49 2013 UTC
#	Line 8	Line 8
8
9	AC_PREREQ([2.50])	AC_PREREQ([2.50])
10
11	AC_INIT([Xvid], [1.3.2], [xvid-devel@xvid.org])	AC_INIT([Xvid], [1.3.3], [xvid-devel@xvid.org])
12	AC_CONFIG_SRCDIR(configure.in)	AC_CONFIG_SRCDIR(configure.in)
13
14	dnl Do not forget to increase that when needed.	dnl Do not forget to increase that when needed.
#	Line 249	Line 249
249	STATIC_EXTENSION=""	STATIC_EXTENSION=""
250	OBJECT_EXTENSION=""	OBJECT_EXTENSION=""
251	case "$target_os" in	case "$target_os" in
252	bsd\|linux\|beos\|irix\|solaris\|gnu)	bsd\|linux\|beos\|irix\|solaris\|gnu\|qnx)
253	AC_MSG_RESULT([.so .a .o])	AC_MSG_RESULT([.so .a .o])
254	STATIC_EXTENSION="a"	STATIC_EXTENSION="a"
255	SHARED_EXTENSION="so"	SHARED_EXTENSION="so"
#	Line 295	Line 295
295	SO_API_MAJOR_LINK=""	SO_API_MAJOR_LINK=""
296	SO_LINK=""	SO_LINK=""
297	case "$target_os" in	case "$target_os" in
298	linux\|solaris\|gnu*)	linux\|solaris\|gnu\|qnx*)
299	AC_MSG_RESULT([ok])	AC_MSG_RESULT([ok])
300	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
301	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
#	Line 318	Line 318
318	STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"	STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
319	SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"	SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
320	SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"	SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
321	SPECIFIC_CFLAGS=""	SPECIFIC_CFLAGS="-mno-cygwin"
322	;;	;;
323	darwin*)	darwin*)
324	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
#	Line 437	Line 437
437	if test "$found_nasm_comp_prog" = "yes" ; then	if test "$found_nasm_comp_prog" = "yes" ; then
438	AC_MSG_CHECKING([for asm object format])	AC_MSG_CHECKING([for asm object format])
439	case "$target_os" in	case "$target_os" in
440	bsd\|linux\|beos\|irix\|solaris\|gnu)	bsd\|linux\|beos\|irix\|solaris\|gnu\|qnx)
441	if test "$ARCHITECTURE" = "X86_64" ; then	if test "$ARCHITECTURE" = "X86_64" ; then
442	AC_MSG_RESULT([elf64])	AC_MSG_RESULT([elf64])
443	NASM_FORMAT="elf64"	NASM_FORMAT="elf64"
#	Line 657	Line 657
657	[pthread_create],	[pthread_create],
658	[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"	[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
659	SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],	SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
660	AC_MSG_WARN(Pthread not supported. No SMP support))],	[AC_CHECK_LIB(
661		[c],
662		[pthread_create],
663		[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
664		SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS"],
665		AC_MSG_WARN(Pthread not supported. No SMP support))])],
666	AC_MSG_WARN(Pthread not supported. No SMP support))	AC_MSG_WARN(Pthread not supported. No SMP support))
667	;;	;;
668	esac	esac
#	Line 706	Line 711
711	CFLAGS=`echo $CFLAGS \| sed s,'-fmove-all-movables','',g`	CFLAGS=`echo $CFLAGS \| sed s,'-fmove-all-movables','',g`
712	CFLAGS=`echo $CFLAGS \| sed s,'-fnew-ra','',g`	CFLAGS=`echo $CFLAGS \| sed s,'-fnew-ra','',g`
713	CFLAGS=`echo $CFLAGS \| sed s,'-fwritable-strings','',g`	CFLAGS=`echo $CFLAGS \| sed s,'-fwritable-strings','',g`
714		SPECIFIC_CFLAGS=`echo $SPECIFIC_CFLAGS \| sed s,'-mno-cygwin','',g`
715	fi	fi
716
717	# GCC 3.4.x	# GCC 3.4.x

 Legend:



Removed from v.2043
 


changed lines


 
Added in v.2067
 Legend:



Removed from v.2043
 


changed lines


 
Added in v.2067
-Removed from v.2043
+Added in v.2067

No admin address has been configured	ViewVC Help
Powered by ViewVC 1.0.4