[pkgsrc/trunk]: pkgsrc/lang/ocaml Partialy revert previous and use {TCL,TK}CO...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c29221e93ab8
branches:  trunk
changeset: 472801:c29221e93ab8
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Apr 12 14:43:39 2004 +0000

description:
Partialy revert previous and use {TCL,TK}CONFIG_SH's content to pass
more accurate data to configure.

Fix -again now that revision 1.4 of mk/pthread.buildlink3.mk had been
reverted- build with threaded Tcl/Tk packages.

diffstat:

 lang/ocaml/Makefile |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r f0c583a20b96 -r c29221e93ab8 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Mon Apr 12 14:41:03 2004 +0000
+++ b/lang/ocaml/Makefile       Mon Apr 12 14:43:39 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/03/30 14:01:30 seb Exp $
+# $NetBSD: Makefile,v 1.27 2004/04/12 14:43:39 seb Exp $
 
 DISTNAME=      ocaml-3.06
 PKGREVISION=   5
@@ -15,7 +15,10 @@
 USE_GNU_TOOLS+=                make
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       -prefix ${PREFIX}
-CONFIGURE_ARGS+=       -cc "${CC} ${CFLAGS} ${CPPFLAGS}"
+CONFIGURE_ARGS+=       -x11include ${X11BASE}/include
+CONFIGURE_ARGS+=       -x11lib ${X11BASE}/lib
+CONFIGURE_ARGS+=       -tkdefs "-I${BUILDLINK_PREFIX.tk}/include  -I${BUILDLINK_PREFIX.tcl}/include"
+CONFIGURE_ARGS+=       -tklibs "`${SH} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO_N} $$TK_LIBS; ${ECHO_N} \ $$TCL_LIBS'`"
 CONFIGURE_ARGS+=       -libs "${LDFLAGS}"
 
 ALL_TARGET=    world