[packages/xine-lib.git] / xine-lib-ac_fixes.patch

--- xine-lib-0.9.9/configure.in~	Thu May  2 20:35:53 2002
+++ xine-lib-0.9.9/configure.in	Thu May  2 20:35:53 2002
@@ -599,200 +599,6 @@
 enable_w32dll="no"
 enable_ffmmx="no"
 
-case "$host_or_hostalias" in
-  i386-*-freebsd*)
-    CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
-    DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS"
-    AC_DEFINE(__i386__)
-    AC_DEFINE([ARCH_X86],,[x86 architecture])
-    AC_DEFINE(FPM_INTEL)
-
-    enable_w32dll="yes"
-    enable_ffmmx="yes"
-    no_fpic="yes"
-    ;;
-
-
-  i?86-*-linux* | i386-*-solaris* | i?86-* | k?-* | athlon-*)
-
-    if test "$GCC" = yes; then
-	dnl Check for gcc cpu optimization support
-	AC_TRY_CFLAGS("-mcpu=i386", 
-		sarchopt="-mcpu",
-		AC_TRY_CFLAGS("-march=i386", 
-			sarchopt="-march",
-			[ AC_MSG_RESULT(** no cpu optimization supports **)
-			  sarchopt=no ]))
-
-	dnl special check for k7 cpu CC support
-        AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
-
-	dnl add x86 specific gcc CFLAGS
-	CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
-
-	DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-
-	if test x"$sarchopt" != "xno"; then
-	    [
-	    archopt_val=
-
-	    case "$host_alias" in
-	    i386-*) # *BSD return this even on a P III #-))
-		archopt_val=i386 ;;
-	    i486-*) # oh dear!
-		archopt_val=i486 ;;
-	    i586-*)
-		archopt_val=pentium ;;
-	    i686-*)
-		archopt_val=pentiumpro
-		if test x"$check_athlon" = "xyes"; then
-		    if test -f /proc/cpuinfo; then
-			modelname=`cat /proc/cpuinfo | grep "model\ name\	:" | sed -e 's/ //g' | cut -d':' -f2`
-			case "$modelname" in
-			*Athlon* | *Duron* | *K7*)
-			    archopt_val="$k7cpu" ;;
-			esac
-		    fi 
-		fi
-		;;
-	    k6-*)
-		archopt_val=k6 ;;
-	    k7-*)
-		archopt_val=k7 ;;
-	    athlon-*)
-		archopt_val=athlon ;;
-	    esac
-
-	    if test x"$archopt_val" != x; then
-		CFLAGS="$CFLAGS $sarchopt=$archopt_val"
-		DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
-	    fi
-	    ]
-	fi
-
-    	dnl enable x86 specific parts of the code
-	dnl
-	dnl all of this stuff needs gcc/gas; it uses gnu c compiler extensions
-	dnl like the extended asm() or __attribute(__cdecl__), or other direct
-	dnl mmx/sse/3dnow assembler instructions. 
-	dnl
-	AC_DEFINE([ARCH_X86],,[x86 architecture])
-	AC_DEFINE(FPM_INTEL)
-	enable_w32dll="yes"
-    	enable_ffmmx="yes"
-    else
-	dnl add x86 specific cc CFLAGS
-	CFLAGS="$CFLAGS -O"
-	DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-    	AC_DEFINE(FPM_64BIT)
-    fi
-
-    no_fpic="yes"
-    AC_DEFINE(__i386__)
-    ;;
-
-  alphaev56-*)
-    CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
-    AC_DEFINE(FPM_64BIT)
-    ;;
-
-  alpha*)
-    CFLAGS="$CFLAGS -O3 -mieee"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
-    AC_DEFINE(FPM_64BIT)
-    ;;
-
-  ppc-*-linux* | powerpc-*) 
-    CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-    AC_DEFINE(FPM_PPC)
-    AC_DEFINE(ARCH_PPC)
-    
-    if test x$enable_altivec = xyes; then
-        AC_DEFINE(ENABLE_ALTIVEC)
-        CFLAGS="$CFLAGS -Wa,-m7400"
-    fi
-    ;;
-
-  sparc*-*-linux*)
-    case $host_alias in
-    sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-    sparc64-*)  cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-    esac
-    CFLAGS="$CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-
-    AC_DEFINE(FPM_SPARC)
-    ;;
-
-  sparc-*-solaris*)
-    if test "$GCC" = yes; then
-	case `uname -m` in
-	sun4c) cpu_cflags="-mcpu=v7 -mtune=supersparc" ;;
-	sun4m) cpu_cflags="-mcpu=v8 -mtune=supersparc" ;;
-	sun4u) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
-	*)     cpu_cflags= ;;
-	esac
-	cc_optimize_cflags="-O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-	cc_debug_cflags="-O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
-        AC_DEFINE(FPM_SPARC)		dnl uses gnu c asm extensions
-    else
-	cc_optimize_cflags="-O"
-	cc_debug_cflags="-O"
-    	AC_DEFINE(FPM_64BIT)		dnl use portable version with non-gcc
-    fi
-    CFLAGS="$CFLAGS $cc_optimize_cflags"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS $cc_debug_cflags"
-    ;;
-
-  mips-*)
-    CFLAGS="$CFLAGS -O3"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-    AC_DEFINE(FPM_MIPS)
-    ;;
-
-  m68k-*)
-    CFLAGS="$CFLAGS -O2"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-    AC_DEFINE(FPM_DEFAULT)
-    ;;
-
-  ia64-*)
-    CFLAGS="$CFLAGS -O3"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-    AC_DEFINE(FPM_64BIT)
-    ;;
-
-  s390-*)
-    CFLAGS="$CFLAGS -O3"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
-    AC_DEFINE(FPM_DEFAULT)
-    ;;
-
-  *)
-    echo
-    echo "****************************** WARNING ******************************"
-    echo
-    echo "Host type '$host' ($host_alias) is currently not supported by xine"
-    echo
-    echo "Assuming that -O3 makes the compiler produce useful code."
-    echo
-    echo "You might experience problems with this, so please report your"
-    echo "architecture and, if possible, known good optimization flags for"
-    echo "your compiler to <xine-devel@lists.sf.net>"\!
-    echo
-    echo "*********************************************************************"
-    echo "\a(sleeping one minute so you can read this...)"
-    sleep 60
-
-    CFLAGS="$CFLAGS -O3"
-    DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
-    AC_DEFINE(FPM_DEFAULT)
-    ;;
-esac
-
-
 CFLAGS="$CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
 DEBUG_CFLAGS="$DEBUG_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
Commit	Line	Data
483841d8	1	--- xine-lib-0.9.9/configure.in~ Thu May 2 20:35:53 2002
	2	+++ xine-lib-0.9.9/configure.in Thu May 2 20:35:53 2002
	3	@@ -599,200 +599,6 @@
	4	enable_w32dll="no"
	5	enable_ffmmx="no"
	6
	7	-case "$host_or_hostalias" in
	8	- i386--freebsd)
	9	- CFLAGS="$CFLAGS -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions"
	10	- DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS"
	11	- AC_DEFINE(__i386__)
	12	- AC_DEFINE([ARCH_X86],,[x86 architecture])
	13	- AC_DEFINE(FPM_INTEL)
	14	-
	15	- enable_w32dll="yes"
	16	- enable_ffmmx="yes"
	17	- no_fpic="yes"
	18	- ;;
	19	-
	20	-
	21	- i?86--linux \| i386--solaris \| i?86-* \| k?-* \| athlon-*)
	22	-
	23	- if test "$GCC" = yes; then
	24	- dnl Check for gcc cpu optimization support
	25	- AC_TRY_CFLAGS("-mcpu=i386",
	26	- sarchopt="-mcpu",
	27	- AC_TRY_CFLAGS("-march=i386",
	28	- sarchopt="-march",
	29	- [ AC_MSG_RESULT( no cpu optimization supports )
	30	- sarchopt=no ]))
	31	-
	32	- dnl special check for k7 cpu CC support
	33	- AC_TRY_CFLAGS("$sarchopt=athlon", k7cpu="athlon", k7cpu="i686")
	34	-
	35	- dnl add x86 specific gcc CFLAGS
	36	- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer -malign-functions=4 -malign-loops=4 -malign-jumps=4 -malign-functions=4 $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
	37	-
	38	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
	39	-
	40	- if test x"$sarchopt" != "xno"; then
	41	- [
	42	- archopt_val=
	43	-
	44	- case "$host_alias" in
	45	- i386-) # BSD return this even on a P III #-))
	46	- archopt_val=i386 ;;
	47	- i486-*) # oh dear!
	48	- archopt_val=i486 ;;
	49	- i586-*)
	50	- archopt_val=pentium ;;
	51	- i686-*)
	52	- archopt_val=pentiumpro
	53	- if test x"$check_athlon" = "xyes"; then
	54	- if test -f /proc/cpuinfo; then
	55	- modelname=`cat /proc/cpuinfo \| grep "model\ name\ :" \| sed -e 's/ //g' \| cut -d':' -f2`
	56	- case "$modelname" in
	57	- Athlon \| Duron \| K7)
	58	- archopt_val="$k7cpu" ;;
	59	- esac
	60	- fi
	61	- fi
	62	- ;;
	63	- k6-*)
	64	- archopt_val=k6 ;;
65	- k7-*)
66	- archopt_val=k7 ;;
67	- athlon-*)
68	- archopt_val=athlon ;;
69	- esac
70	-
71	- if test x"$archopt_val" != x; then
72	- CFLAGS="$CFLAGS $sarchopt=$archopt_val"
73	- DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
74	- fi
75	- ]
76	- fi
77	-
78	- dnl enable x86 specific parts of the code
79	- dnl
80	- dnl all of this stuff needs gcc/gas; it uses gnu c compiler extensions
81	- dnl like the extended asm() or __attribute(__cdecl__), or other direct
82	- dnl mmx/sse/3dnow assembler instructions.
83	- dnl
84	- AC_DEFINE([ARCH_X86],,[x86 architecture])
85	- AC_DEFINE(FPM_INTEL)
86	- enable_w32dll="yes"
87	- enable_ffmmx="yes"
88	- else
89	- dnl add x86 specific cc CFLAGS
90	- CFLAGS="$CFLAGS -O"
91	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
92	- AC_DEFINE(FPM_64BIT)
93	- fi
94	-
95	- no_fpic="yes"
96	- AC_DEFINE(__i386__)
97	- ;;
98	-
99	- alphaev56-*)
100	- CFLAGS="$CFLAGS -O3 -mcpu=ev56 -mieee"
101	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee"
102	- AC_DEFINE(FPM_64BIT)
103	- ;;
104	-
105	- alpha*)
106	- CFLAGS="$CFLAGS -O3 -mieee"
107	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee"
108	- AC_DEFINE(FPM_64BIT)
109	- ;;
110	-
111	- ppc--linux \| powerpc-*)
112	- CFLAGS="$CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions"
113	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
114	- AC_DEFINE(FPM_PPC)
115	- AC_DEFINE(ARCH_PPC)
116	-
117	- if test x$enable_altivec = xyes; then
118	- AC_DEFINE(ENABLE_ALTIVEC)
119	- CFLAGS="$CFLAGS -Wa,-m7400"
120	- fi
121	- ;;
122	-
123	- sparc--linux*)
124	- case $host_alias in
125	- sparc-*) cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
126	- sparc64-*) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
127	- esac
128	- CFLAGS="$CFLAGS -O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
129	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
130	-
131	- AC_DEFINE(FPM_SPARC)
132	- ;;
133	-
134	- sparc--solaris)
135	- if test "$GCC" = yes; then
136	- case `uname -m` in
137	- sun4c) cpu_cflags="-mcpu=v7 -mtune=supersparc" ;;
138	- sun4m) cpu_cflags="-mcpu=v8 -mtune=supersparc" ;;
139	- sun4u) cpu_cflags="-mcpu=supersparc -mtune=ultrasparc" ;;
140	- *) cpu_cflags= ;;
141	- esac
142	- cc_optimize_cflags="-O3 $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
143	- cc_debug_cflags="-O $cpu_cflags -funroll-loops -funroll-all-loops -finline-functions"
144	- AC_DEFINE(FPM_SPARC) dnl uses gnu c asm extensions
145	- else
146	- cc_optimize_cflags="-O"
147	- cc_debug_cflags="-O"
148	- AC_DEFINE(FPM_64BIT) dnl use portable version with non-gcc
149	- fi
150	- CFLAGS="$CFLAGS $cc_optimize_cflags"
151	- DEBUG_CFLAGS="$DEBUG_CFLAGS $cc_debug_cflags"
152	- ;;
153	-
154	- mips-*)
155	- CFLAGS="$CFLAGS -O3"
156	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
157	- AC_DEFINE(FPM_MIPS)
158	- ;;
159	-
160	- m68k-*)
161	- CFLAGS="$CFLAGS -O2"
162	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
163	- AC_DEFINE(FPM_DEFAULT)
164	- ;;
165	-
166	- ia64-*)
167	- CFLAGS="$CFLAGS -O3"
168	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
169	- AC_DEFINE(FPM_64BIT)
170	- ;;
171	-
172	- s390-*)
173	- CFLAGS="$CFLAGS -O3"
174	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O3"
175	- AC_DEFINE(FPM_DEFAULT)
176	- ;;
177	-
178	- *)
179	- echo
180	- echo "**************************** WARNING ****************************"
181	- echo
182	- echo "Host type '$host' ($host_alias) is currently not supported by xine"
183	- echo
184	- echo "Assuming that -O3 makes the compiler produce useful code."
185	- echo
186	- echo "You might experience problems with this, so please report your"
187	- echo "architecture and, if possible, known good optimization flags for"
188	- echo "your compiler to <xine-devel@lists.sf.net>"\!
189	- echo
190	- echo "*********************************************************************"
191	- echo "\a(sleeping one minute so you can read this...)"
192	- sleep 60
193	-
194	- CFLAGS="$CFLAGS -O3"
195	- DEBUG_CFLAGS="$DEBUG_CFLAGS -O"
196	- AC_DEFINE(FPM_DEFAULT)
197	- ;;
198	-esac
199	-
200	-
201	CFLAGS="$CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
202	DEBUG_CFLAGS="$DEBUG_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS $ARTS_CFLAGS $IRIXAL_CFLAGS"
203