* extras/contrib/src/Makefile, extras/contrib/src/Patches/goom2k4-0-win32.patch:...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8fec45bf0b8cc6c0ca531da6feb58501fecd01d6..20aa37a957d03831a1d3741160c0aad16f11ca92 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1009,7 +1009,7 @@ endif
 ifdef HAVE_DARWIN_OS
        (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
 else
-       (cd $<&& autoconf configure.in >|configure && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
+       (cd $< && rm -f configure; autoconf configure.in > configure && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
 endif
        touch $@
 

diff --git a/extras/contrib/src/Patches/goom2k4-0-win32.patch b/extras/contrib/src/Patches/goom2k4-0-win32.patch
index fd5819af0adaabbfb83123bd6f27a87f80805ce9..897a77def80294e76647410af8fd69cfda7338a8 100644 (file)
--- a/extras/contrib/src/Patches/goom2k4-0-win32.patch
+++ b/extras/contrib/src/Patches/goom2k4-0-win32.patch
@@ -2,38 +2,38 @@ diff -Naur goom-orig/configure.in goom/configure.in
 --- goom-orig/configure.in     2005-02-07 14:46:41.000000000 +0100
 +++ goom/configure.in  2005-08-26 16:37:03.000000000 +0200
 @@ -1,6 +1,5 @@
- AC_INIT(README)\r
- \r
--AM_DISABLE_STATIC\r
- AM_INIT_AUTOMAKE(SDL_Goom, 2k4)\r
- \r
- ACLOCAL="$ACLOCAL -I m4"\r
+ AC_INIT(README)
+ 
+-AM_DISABLE_STATIC
+ AM_INIT_AUTOMAKE(SDL_Goom, 2k4)
+ 
+ ACLOCAL="$ACLOCAL -I m4"
 @@ -76,24 +75,7 @@
- AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")\r
- \r
- \r
--AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))\r
--\r
--PTHREAD_LIBS=error\r
--AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")\r
--\r
--if test "x$PTHREAD_LIBS" = xerror; then\r
--    AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")\r
--fi\r
--\r
--if test "x$PTHREAD_LIBS" = xerror; then\r
--    AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")\r
--fi\r
--\r
--if test "x$PTHREAD_LIBS" = xerror; then\r
--    AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")\r
--fi\r
--\r
--AC_SUBST(PTHREAD_LIBS)\r
-+dnl AC_SUBST(PTHREAD_LIBS)\r
- \r
- dnl rm -f mmx_zoom.s\r
- dnl   echo -n checking for nasm...\r
+ AM_CONDITIONAL(MACTARGET,test "x$MACTARGET" = "xyes")
+ 
+ 
+-AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
+-
+-PTHREAD_LIBS=error
+-AC_CHECK_LIB(pthread, pthread_attr_init, PTHREAD_LIBS="-lpthread")
+-
+-if test "x$PTHREAD_LIBS" = xerror; then
+-    AC_CHECK_LIB(pthreads, pthread_attr_init, PTHREAD_LIBS="-lpthreads")
+-fi
+-
+-if test "x$PTHREAD_LIBS" = xerror; then
+-    AC_CHECK_LIB(c_r, pthread_attr_init, PTHREAD_LIBS="-lc_r")
+-fi
+-
+-if test "x$PTHREAD_LIBS" = xerror; then
+-    AC_CHECK_FUNC(pthread_attr_init, PTHREAD_LIBS="")
+-fi
+-
+-AC_SUBST(PTHREAD_LIBS)
++dnl AC_SUBST(PTHREAD_LIBS)
+ 
+ dnl rm -f mmx_zoom.s
+ dnl   echo -n checking for nasm...
 diff -Naur goom-orig/src/filters.c goom/src/filters.c
 --- goom-orig/src/filters.c    2005-02-07 14:46:41.000000000 +0100
 +++ goom/src/filters.c 2005-08-26 16:31:17.000000000 +0200