patch silly configure.
authorChristophe Mutricy <xtophe@videolan.org>
Sun, 5 Nov 2006 20:02:49 +0000 (20:02 +0000)
committerChristophe Mutricy <xtophe@videolan.org>
Sun, 5 Nov 2006 20:02:49 +0000 (20:02 +0000)
extras/contrib/src/Makefile
extras/contrib/src/Patches/pkgcfg.patch [new file with mode: 0644]

index 219d5c8..58de533 100644 (file)
@@ -387,9 +387,10 @@ pkg-config-$(PKGCFG_VERSION).tar.gz:
 pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
+       patch -d pkgconfig -p0 < Patches/pkgcfg.patch
 
 .pkgcfg: pkgconfig
-       (cd pkgconfig; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd pkgconfig; autoconf && ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
        touch $@
 
 CLEAN_FILE += .pkgcfg
diff --git a/extras/contrib/src/Patches/pkgcfg.patch b/extras/contrib/src/Patches/pkgcfg.patch
new file mode 100644 (file)
index 0000000..21c28a5
--- /dev/null
@@ -0,0 +1,17 @@
+--- configure.in.orig  2006-11-05 19:40:10.000000000 +0000
++++ configure.in       2006-11-05 19:42:10.000000000 +0000
+@@ -62,10 +62,10 @@
+ AC_MSG_CHECKING([for Win32])
+ case "$host" in
+-  *-*-mingw*)
+-    native_win32=yes
+-    AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib])
+-  ;;
++dnl  *-*-mingw*)
++dnl    native_win32=yes
++dnl    AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib])
++dnl  ;;
+   *)
+     native_win32=no
+   ;;