summaryrefslogtreecommitdiff
path: root/cad/xcircuit/patches/patch-aa
blob: 07ad33ac81fcbd967d2ffb9688fc7535d855aa52 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
$NetBSD: patch-aa,v 1.8 2006/10/14 02:21:22 rillig Exp $

--- configure.in.orig	2004-10-01 06:24:09.000000000 +0200
+++ configure.in	2006-10-14 04:19:51.000000000 +0200
@@ -255,7 +255,7 @@ xc_with_tk_libraries=""
 AC_ARG_WITH(tcl,
 [  --with-tcl=DIR          Find tclConfig.sh in DIR], [
   xc_with_tcl=$withval
-  if test "$withval" == "no" -o "$withval" == "NO"; then
+  if test "$withval" = "no" -o "$withval" = "NO"; then
       xc_with_tcl=""
   fi
 ], ) 
@@ -469,6 +469,7 @@ fi
 if test "x$xc_with_tcl" != "x" ; then
   . $tcl_config_sh
   . $tk_config_sh
+  LIBS="${LIBS} ${TCL_LIBS}"
 
   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
     :
@@ -544,7 +545,7 @@ fi
 
 if test "x$xc_with_tcl" != "x" ; then
   case $target in
-    *-sunos4*|*-*-netbsd|NetBSD-*|FreeBSD-*|OpenBSD-*)
+    *-sunos4*|*-*-netbsd|*-*-netbsdelf|NetBSD-*|FreeBSD-*|OpenBSD-*|*-*-dragonfly*)
       TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
       ;;
@@ -886,13 +887,13 @@ if test "x$xc_with_tcl" != "x" ; then
       EXTRA_LIB_SPECS="-ldl"
       ;;
 
-    *-netbsd*|*-freebsd*|*-openbsd*)
+    *-netbsd*|*-freebsd*|*-openbsd*|*-*-dragonfly*)
       # Not available on all versions:  check for include file.
       AC_CHECK_HEADER(dlfcn.h, test_ok=yes, test_ok=no)
       if test "$test_ok" = yes; then
-        SHLIB_CFLAGS="-fpic"
-        SHLIB_LD="ld"
-        LDDL_FLAGS="-Bshareable -x ${LIB_SPEC}"
+        SHLIB_CFLAGS="-fPIC"
+        SHLIB_LD=$CC
+        LDDL_FLAGS="-shared"
       fi
       ;;