Fix on x86 architectures - was just checking for 386, D'oh.

Original commit message from CVS:
Fix on x86 architectures - was just checking for 386, D'oh.
Fix autogen to run autoheader _before_ autoconf, since it generates a
required file (config.h.in, which I just removed from CVS since its an
autogenerated one).  Also fix messed up variables in gst/Makefile.am

diff --git a/.gitignore b/.gitignore
index 52b9d01eb93c938f039394d0c3034b2dfc030bf2..320b264a344ef904eaa0d6696df7323c103d5916 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ aclocal.m4
 config.cache
 config.guess
 config.h
 config.cache
 config.guess
 config.h

+config.h.in

 config.log
 config.status
 config.sub
 config.log
 config.status
 config.sub

diff --git a/autogen.sh b/autogen.sh
index 1e0e7be7f786ae2e8d4fa3ca1b8c8412b9de7c99..6898683488a53b4d4d4710d6d9a3c3974a08a3de 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -46,8 +46,8 @@ fi
 libtoolize --copy --force
 aclocal $ACLOCAL_FLAGS
 automake --add-missing
 libtoolize --copy --force
 aclocal $ACLOCAL_FLAGS
 automake --add-missing

-autoconf

 autoheader
 autoheader

+autoconf

 
 if [ "x$1" = "x--autogen-recurse" ];then
   exit # the rest will happen later
 
 if [ "x$1" = "x--autogen-recurse" ];then
   exit # the rest will happen later

diff --git a/configure.in b/configure.in
index 40d4ec3a43a350e593ebfd3b3eefbbdedfec2762..feaf904007c82ca02c9f594dc0bfb9b8d9f1a5d2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -48,7 +48,7 @@ dnl Set up conditionals for (target) host type:
 dnl ===========================================
 
 case "x${target_cpu}" in
 dnl ===========================================
 
 case "x${target_cpu}" in

-  xi386)     HAVE_CPU_I386=yes ;
+  xi?86)     HAVE_CPU_I386=yes ;

              AC_DEFINE(HAVE_CPU_I386) ;;
   xpowerpc)  HAVE_CPU_PPC=yes ;
              AC_DEFINE(HAVE_CPU_PPC) ;;
              AC_DEFINE(HAVE_CPU_I386) ;;
   xpowerpc)  HAVE_CPU_PPC=yes ;
              AC_DEFINE(HAVE_CPU_PPC) ;;

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 454324844c84e9d3708908d9ec73d6e6464e1bca..f10fbe85f4ed27d68638b6bcfa9dd063d225bf7c 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -26,8 +26,7 @@ libgst_la_SOURCES =   \
        gstbufferpool.c \
        gstclock.c      \
        gstcpu.c        \
        gstbufferpool.c \
        gstclock.c      \
        gstcpu.c        \

-       $(GSTI386_SRCS) \
-       $(GSTPPC_SRCS)  \
+       $(GSTARCH_SRCS) \

        gstelement.c    \
        gstelementfactory.c     \
        gstbin.c        \
        gstelement.c    \
        gstelementfactory.c     \
        gstbin.c        \

diff --git a/gst/gstarch.h b/gst/gstarch.h
index 0e1ae82e03848dfe880b58beb6f956b5460f4187..14dc1b542b96e90993b37dab9a44b439d3830c8a 100644 (file)
--- a/gst/gstarch.h
+++ b/gst/gstarch.h
@@ -1,12 +1,16 @@
 #ifndef GST_HGUARD_GSTARCH_H
 #define GST_HGUARD_GSTARCH_H
 
 #ifndef GST_HGUARD_GSTARCH_H
 #define GST_HGUARD_GSTARCH_H
 

-#ifdef __I386__
-#include "gsti386.h"
-#endif
+#include "config.h"

 
 

-#ifdef __PPC__
+#ifdef HAVE_CPU_I386
+#include "gsti386.h"
+#else
+#ifdef HAVE_CPU_PPC

 #include "gstppc.h"
 #include "gstppc.h"

+#else
+#warn Need to know about this architecture, or have a generic implementation
+#endif

 #endif
 
 #endif /* GST_HGUARD_GSTARCH_H */
 #endif
 
 #endif /* GST_HGUARD_GSTARCH_H */

diff --git a/gst/gsti386.h b/gst/gsti386.h
index 485ff58ba99381ee4dc1109a557ae488886d73e5..beab1aeaf724227008b8bf43154486802748ba81 100644 (file)
--- a/gst/gsti386.h
+++ b/gst/gsti386.h
@@ -1,9 +1,6 @@
 #ifndef GST_HGUARD_GSTI386_H
 #define GST_HGUARD_GSTI386_H
 
 #ifndef GST_HGUARD_GSTI386_H
 #define GST_HGUARD_GSTI386_H
 

-/* Hmm - does this work, or do the braces cause other stack manipulation?
- * XXX
- */

 #define GET_SP(target) \
   __asm__("movl %%esp, %0" : "=m"(target) : : "esp", "ebp");
 
 #define GET_SP(target) \
   __asm__("movl %%esp, %0" : "=m"(target) : : "esp", "ebp");