diff options
Diffstat (limited to 'patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff')
| -rw-r--r-- | patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff b/patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff new file mode 100644 index 000000000..5e262132a --- /dev/null +++ b/patches/libX11-1.1.4/libX11-1.1.4-autoreconf.diff @@ -0,0 +1,135 @@ +diff -ur libX11-1.1.4-orig/src/util/Makefile.in libX11-1.1.4/src/util/Makefile.in +--- libX11-1.1.4-orig/src/util/Makefile.in 2008-03-06 21:48:52.000000000 +0100 ++++ libX11-1.1.4/src/util/Makefile.in 2008-05-18 13:08:18.000000000 +0200 +@@ -1,8 +1,8 @@ +-# Makefile.in generated by automake 1.10.1 from Makefile.am. ++# Makefile.in generated by automake 1.10 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -51,9 +51,9 @@ + makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT) + makekeys_LDADD = $(LDADD) + makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +- --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ +- $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++ --mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) \ ++ $(makekeys_LDFLAGS) $(LDFLAGS) -o $@ ++DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -62,6 +62,9 @@ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) ++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ ++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ ++ $(LDFLAGS) -o $@ + SOURCES = makekeys.c + DIST_SOURCES = makekeys.c + ETAGS = etags +@@ -80,11 +83,13 @@ + AWK = @AWK@ + BIGFONT_CFLAGS = @BIGFONT_CFLAGS@ + BIGFONT_LIBS = @BIGFONT_LIBS@ +-CC = @CC@ ++CC = $(CC_FOR_BUILD) + CCDEPMODE = @CCDEPMODE@ +-CFLAGS = @CFLAGS@ ++ ++# evil hack ++CFLAGS = $(CFLAGS_FOR_BUILD) $(X11_CFLAGS) $(BIGREQS_CFLAGS) + CPP = @CPP@ +-CPPFLAGS = @CPPFLAGS@ ++CPPFLAGS = $(CPPFLAGS_FOR_BUILD) + CXX = @CXX@ + CXXCPP = @CXXCPP@ + CXXDEPMODE = @CXXDEPMODE@ +@@ -94,6 +99,7 @@ + DEPDIR = @DEPDIR@ + DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ + DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ++DSYMUTIL = @DSYMUTIL@ + ECHO = @ECHO@ + ECHO_C = @ECHO_C@ + ECHO_N = @ECHO_N@ +@@ -113,10 +119,10 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + KEYSYMDEF = @KEYSYMDEF@ + LAUNCHD = @LAUNCHD@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = $(LDFLAGS_FOR_BUILD) + LIBOBJS = @LIBOBJS@ + LIBS = @LIBS@ +-LIBTOOL = @LIBTOOL@ ++LIBTOOL = @LIBTOOL@ --tag=CC + LIB_MAN_DIR = @LIB_MAN_DIR@ + LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ + LINT = @LINT@ +@@ -130,6 +136,7 @@ + MISC_MAN_DIR = @MISC_MAN_DIR@ + MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ + MKDIR_P = @MKDIR_P@ ++NMEDIT = @NMEDIT@ + OBJEXT = @OBJEXT@ + PACKAGE = @PACKAGE@ + PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +@@ -225,10 +232,9 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-makekeys_CFLAGS = $(X11_CFLAGS) +- +-#override CC = gcc +-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++makekeys_CFLAGS = $(CFLAGS_FOR_BUILD) ++makekeys_CPPLAGS = $(CPPFLAGS_FOR_BUILD) ++makekeys_LDFLAGS = $(LDFLAGS_FOR_BUILD) + EXTRA_DIST = mkks.sh + + # Check source code with tools like lint & sparse +@@ -333,8 +339,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + mkid -fID $$unique + tags: TAGS + +@@ -346,8 +352,8 @@ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +@@ -357,12 +363,13 @@ + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ ++ here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ +- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ +- END { if (nonempty) { for (i in files) print i; }; }'`; \ ++ $(AWK) ' { files[$$0] = 1; } \ ++ END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique |