summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-11-19 22:21:01 (GMT)
committernijtmans <nijtmans>2009-11-19 22:21:01 (GMT)
commit245b7b3172213b9fa7ab9e493c0a7965fe1a64a6 (patch)
tree9834e2fe639adbc3108681060a21472d18cff4d5 /unix/Makefile.in
parent1501cea96479e7bbb0ffb3eade53e0581934d037 (diff)
downloadtk-245b7b3172213b9fa7ab9e493c0a7965fe1a64a6.zip
tk-245b7b3172213b9fa7ab9e493c0a7965fe1a64a6.tar.gz
tk-245b7b3172213b9fa7ab9e493c0a7965fe1a64a6.tar.bz2
[Patch #2883533] tcl.m4 support for Haiku OS
unix/Makefile.in: Fix library order in X11_LIB_SWITCHES
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3e152b1..ff2bf5b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.160 2009/11/10 23:36:19 andreas_kupries Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.161 2009/11/19 22:21:01 nijtmans Exp $
# Current Tk version; used in various names.
@@ -156,7 +156,7 @@ AQUA_INCLUDES = -I$(MAC_OSX_DIR) -I$(XLIB_DIR)
# Linker switch(es) to use to link with the X11 library archive (the
# configure script will try to set this value automatically, but you
# can override it).
-X11_LIB_SWITCHES = @XLIBSW@ $(XFT_LIBS)
+X11_LIB_SWITCHES = $(XFT_LIBS) @XLIBSW@
# To turn off the security checks that disallow incoming sends when
@@ -332,7 +332,7 @@ CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
${PROTO_FLAGS} ${SECURITY_FLAGS} ${MEM_DEBUG_FLAGS} ${KEYSYM_FLAGS} \
${NO_DEPRECATED_FLAGS} @EXTRA_CC_SWITCHES@
-CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) ${TCL_STUB_FLAGS}
+CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @TCL_STUB_FLAGS@
APP_CC_SWITCHES = $(CC_SWITCHES_NO_STUBS) @EXTRA_APP_CC_SWITCHES@