On Tue, 25 May 2010, Viktor Szakáts wrote:
hi,
> I've committed, along with hbmk2 patch, so in theory
> the last issue with HB_USER_LDFLAGS should be fixed.
> (since the /pkg dir is already hardcoded when checking
> for slang2, I think it's just fine to also add it to
> lib list in hbmk2)
nice, thanks.
let me make a small amendment:
- reorg includes so that in case only slang1 is installed, it too can
be used, and when both slang1 and slang2 are installed, slang2 is
favored (in fact, this is a necessity, since the config/bsd/libs.mk
snippet as well as your hbmk2 addition will pick libslang2 up if it
is present). gtsln will apparently work with both (lightly tested).
again, this should hold true for all pkgsrc platforms (primarily
netbsd, apart from dfly, in our case).
- it seems i got the x.h/xlib.h thing all mixed up afterall, so revert
that.
Index: config/detect.mk
===================================================================
--- config/detect.mk (revision 14585)
+++ config/detect.mk (working copy)
@@ -104,7 +104,7 @@
_DET_INC_DEFP += /usr/local/include /usr/local/include/slang
_DET_INC_DEFP += /sw/include /sw/include/slang
_DET_INC_DEFP += /opt/local/include /opt/local/include/slang
-_DET_INC_DEFP += /usr/pkg/include/slang2
+_DET_INC_DEFP += /usr/pkg/include/slang2 /usr/pkg/include
include $(TOP)$(ROOT)config/detfun.mk
@@ -132,7 +132,7 @@
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include /usr/local/include /usr/X11R6/include
/usr/pkg/include
-_DET_INC_HEAD := /X11/X.h
+_DET_INC_HEAD := /X11/Xlib.h
include $(TOP)$(ROOT)config/detfun.mk
--
[-]
mkdir /nonexistent
Index: config/detect.mk
===================================================================
--- config/detect.mk (revision 14585)
+++ config/detect.mk (working copy)
@@ -104,7 +104,7 @@
_DET_INC_DEFP += /usr/local/include /usr/local/include/slang
_DET_INC_DEFP += /sw/include /sw/include/slang
_DET_INC_DEFP += /opt/local/include /opt/local/include/slang
-_DET_INC_DEFP += /usr/pkg/include/slang2
+_DET_INC_DEFP += /usr/pkg/include/slang2 /usr/pkg/include
include $(TOP)$(ROOT)config/detfun.mk
@@ -132,7 +132,7 @@
_DET_FLT_PLAT :=
_DET_FLT_COMP :=
_DET_INC_DEFP := /usr/include /usr/local/include /usr/X11R6/include /usr/pkg/include
-_DET_INC_HEAD := /X11/X.h
+_DET_INC_HEAD := /X11/Xlib.h
include $(TOP)$(ROOT)config/detfun.mk
_______________________________________________
Harbour mailing list (attachment size limit: 40KB)
Harbour@harbour-project.org
http://lists.harbour-project.org/mailman/listinfo/harbour
