diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | m4/xv.m4 | 8 | ||||
| -rw-r--r-- | src/post/goom/Makefile.am | 2 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index db8ab01d2..0b8e042cd 100644 --- a/configure.ac +++ b/configure.ac @@ -599,10 +599,15 @@ case "$host_or_hostalias" in *-*-darwin*) case "$host_or_hostalias" in - i386-* | universal-* | x86_64-*) + universal-*) + arch_ppc=yes + arch_x86=yes + ;; + i386-* | x86_64-*) arch_x86=yes ;; ppc* | powerpc*) + arch_ppc=yes dnl avoid ppc compilation crash AS="$CC" @@ -627,6 +632,8 @@ case "$host_or_hostalias" in ;; ppc-*-linux* | powerpc-*) + arch_ppc=yes + dnl avoid ppc compilation crash AS="$CC" AC_DEFINE([ARCH_PPC], [], [Define this if you're running PowerPC architecture]) @@ -763,6 +770,7 @@ if test x"$arch_x86" = x"yes"; then AC_DEFINE([ARCH_X86], [], [Define this if you're running x86 architecture]) AC_DEFINE([HAVE_MMX], [], [Define this if you can compile MMX asm instructions]) fi +AM_CONDITIONAL([ARCH_PPC], test x"$arch_ppc" = x"yes") AM_CONDITIONAL([ARCH_X86], test x"$arch_x86" = x"yes") AM_CONDITIONAL([HAVE_MMX], test x"$arch_x86" = x"yes") AM_CONDITIONAL([HOST_OS_DARWIN], test x"$HOST_OS_DARWIN" = x"1") @@ -128,15 +128,7 @@ AC_DEFUN([XINE_XV_SUPPORT], [ XV_LIBS="libXv.so" fi ;; - - ppc-*-linux* | powerpc-*) - ppc_arch="yes" - ;; - - *) - ;; esac - AM_CONDITIONAL(PPC_ARCH, test "x$ppc_arch" = "xyes") dnl dnl Check if we can enable the xxmc plugin. diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index a8dc13ab0..eeed54697 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = mmx.c xmmx.c ppc_drawings.s ppc_zoom_ultimate.s diff_against_releas xinepost_LTLIBRARIES = xineplug_post_goom.la ## doesn't work -#if PPC_ARCH +#if ARCH_PPC #extra_files = ppc_drawings.s ppc_zoom_ultimate.s #AM_CPPFLAGS = -DCPU_POWERPC #endif diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 1e58d9fc1..484830cf9 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -1,18 +1,18 @@ include $(top_srcdir)/misc/Makefile.common +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG) +AM_CPPFLAGS = -DXINE_LIBRARY_COMPILE + noinst_LTLIBRARIES = libxineutils.la EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl -if PPC_ARCH +if ARCH_PPC if !HOST_OS_DARWIN pppc_files = ppcasm_string.S endif endif -AM_CFLAGS = $(DEFAULT_OCFLAGS) $(X_CFLAGS) $(VISIBILITY_FLAG) -AM_CPPFLAGS=-DXINE_LIBRARY_COMPILE - libxineutils_la_SOURCES = $(pppc_files) \ cpu_accel.c \ color.c \ |