Skip to content

Commit

Permalink
Include the TK_INCLUDES and TK_XINCLUDES flags in INCLUDES. This make…
Browse files Browse the repository at this point in the history 
…s sure we get X11 from non-standard installation paths

Could be a case for adding /opt to the SC_PATH_X macro in tcl.m4 as well, we currently rely on xmkmf to report the standard include directory, that comes and goes in various X11's
  • Loading branch information
@pwdraper
pwdraper committed Aug 5, 2012
1 parent bf244e0 commit 10b0dab
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions astrotcl/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)

SHARED_BUILD = @SHARED_BUILD@

INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@

PKG_CFLAGS = @PKG_CFLAGS@

Expand Down
4 changes: 2 additions & 2 deletions cat/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)

SHARED_BUILD = @SHARED_BUILD@

INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@

PKG_CFLAGS = @PKG_CFLAGS@

Expand Down
4 changes: 2 additions & 2 deletions rtd/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)

SHARED_BUILD = @SHARED_BUILD@

INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@

PKG_CFLAGS = @PKG_CFLAGS@

Expand Down
4 changes: 2 additions & 2 deletions skycat/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)

SHARED_BUILD = @SHARED_BUILD@

INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@
#INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@ @TK_XINCLUDES@

PKG_CFLAGS = @PKG_CFLAGS@

Expand Down

0 comments on commit 10b0dab

Please sign in to comment.