[packages] gtkmm: fix autoreconf
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24827 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
30163ff9c2
commit
0dad492bd5
29
Xorg/lib/gtkmm/patches/001-automake-compat.patch
Normal file
29
Xorg/lib/gtkmm/patches/001-automake-compat.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -119,15 +119,15 @@ AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl
|
||||||
|
SUN make does not work for building gtkmm.
|
||||||
|
Please install GNU make.]))
|
||||||
|
|
||||||
|
-# This macro is installed by glibmm
|
||||||
|
+# This macro is installed by mm-macros
|
||||||
|
# Doxygen needs the path to the installed perl.
|
||||||
|
-GLIBMM_CHECK_PERL([5.6.0])
|
||||||
|
+MM_CHECK_PERL([5.6.0])
|
||||||
|
|
||||||
|
#########################################################################
|
||||||
|
# Function checks
|
||||||
|
#########################################################################
|
||||||
|
|
||||||
|
-AC_CHECK_FUNC(mkfifo, AC_DEFINE(HAVE_MKFIFO))
|
||||||
|
+AC_CHECK_FUNC(mkfifo, AC_DEFINE([HAVE_MKFIFO], [], [Define if mkfifo is available]))
|
||||||
|
|
||||||
|
# functions used in demos/gtk-demo. Undefined in config.h.
|
||||||
|
AC_LANG_PUSH(C++)
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -1,3 +1,5 @@
|
||||||
|
+ACLOCAL_AMFLAGS = -I scripts
|
||||||
|
+
|
||||||
|
if GTKMM_ATKMM_ENABLED
|
||||||
|
ATK_SUBDIR=atk
|
||||||
|
else
|
@ -1,7 +1,6 @@
|
|||||||
diff -ruN gtkmm-2.16.0.orig/configure gtkmm-2.16.0/configure
|
--- a/configure
|
||||||
--- gtkmm-2.16.0.orig/configure 2009-03-16 12:33:19.000000000 +0100
|
+++ b/configure
|
||||||
+++ gtkmm-2.16.0/configure 2009-11-05 19:43:21.000000000 +0100
|
@@ -22179,10 +22179,7 @@ fi
|
||||||
@@ -22179,10 +22179,7 @@
|
|
||||||
AUTOHEADER=':'
|
AUTOHEADER=':'
|
||||||
|
|
||||||
|
|
||||||
@ -13,7 +12,7 @@ diff -ruN gtkmm-2.16.0.orig/configure gtkmm-2.16.0/configure
|
|||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files scripts/Makefile"
|
ac_config_files="$ac_config_files scripts/Makefile"
|
||||||
@@ -22870,22 +22867,6 @@
|
@@ -22870,22 +22867,6 @@ do
|
||||||
"gtk/src/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/src/Makefile" ;;
|
"gtk/src/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/src/Makefile" ;;
|
||||||
"gtk/gtkmm/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/Makefile" ;;
|
"gtk/gtkmm/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/Makefile" ;;
|
||||||
"gtk/gtkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/private/Makefile" ;;
|
"gtk/gtkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/private/Makefile" ;;
|
||||||
@ -36,10 +35,9 @@ diff -ruN gtkmm-2.16.0.orig/configure gtkmm-2.16.0/configure
|
|||||||
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
|
"scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
|
||||||
"MSVC_Net2005/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/Makefile" ;;
|
"MSVC_Net2005/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/Makefile" ;;
|
||||||
"MSVC_Net2005/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/gendef/Makefile" ;;
|
"MSVC_Net2005/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/gendef/Makefile" ;;
|
||||||
diff -ruN gtkmm-2.16.0.orig/configure.in gtkmm-2.16.0/configure.in
|
--- a/configure.in
|
||||||
--- gtkmm-2.16.0.orig/configure.in 2009-03-16 12:19:50.000000000 +0100
|
+++ b/configure.in
|
||||||
+++ gtkmm-2.16.0/configure.in 2009-11-05 19:42:17.000000000 +0100
|
@@ -405,26 +405,6 @@ AC_CONFIG_FILES([
|
||||||
@@ -405,26 +405,6 @@
|
|
||||||
gtk/src/Makefile
|
gtk/src/Makefile
|
||||||
gtk/gtkmm/Makefile
|
gtk/gtkmm/Makefile
|
||||||
gtk/gtkmm/private/Makefile
|
gtk/gtkmm/private/Makefile
|
||||||
@ -66,10 +64,9 @@ diff -ruN gtkmm-2.16.0.orig/configure.in gtkmm-2.16.0/configure.in
|
|||||||
])
|
])
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
diff -ruN gtkmm-2.16.0.orig/Makefile.am gtkmm-2.16.0/Makefile.am
|
--- a/Makefile.am
|
||||||
--- gtkmm-2.16.0.orig/Makefile.am 2008-11-18 17:17:02.000000000 +0100
|
+++ b/Makefile.am
|
||||||
+++ gtkmm-2.16.0/Makefile.am 2009-11-05 19:43:50.000000000 +0100
|
@@ -6,7 +6,7 @@ else
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
ATK_SUBDIR=
|
ATK_SUBDIR=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -78,10 +75,9 @@ diff -ruN gtkmm-2.16.0.orig/Makefile.am gtkmm-2.16.0/Makefile.am
|
|||||||
DIST_SUBDIRS = $(SUBDIRS) scripts
|
DIST_SUBDIRS = $(SUBDIRS) scripts
|
||||||
|
|
||||||
EXTRA_DIST = build_shared/Makefile_build.am_fragment \
|
EXTRA_DIST = build_shared/Makefile_build.am_fragment \
|
||||||
diff -ruN gtkmm-2.16.0.orig/Makefile.in gtkmm-2.16.0/Makefile.in
|
--- a/Makefile.in
|
||||||
--- gtkmm-2.16.0.orig/Makefile.in 2009-03-16 12:32:56.000000000 +0100
|
+++ b/Makefile.in
|
||||||
+++ gtkmm-2.16.0/Makefile.in 2009-11-05 19:43:39.000000000 +0100
|
@@ -213,7 +213,7 @@ top_builddir = @top_builddir@
|
||||||
@@ -213,7 +213,7 @@
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
@GTKMM_ATKMM_ENABLED_FALSE@ATK_SUBDIR =
|
@GTKMM_ATKMM_ENABLED_FALSE@ATK_SUBDIR =
|
||||||
@GTKMM_ATKMM_ENABLED_TRUE@ATK_SUBDIR = atk
|
@GTKMM_ATKMM_ENABLED_TRUE@ATK_SUBDIR = atk
|
||||||
|
Loading…
x
Reference in New Issue
Block a user