summaryrefslogtreecommitdiff
path: root/cad/xcircuit/patches/patch-ab
blob: 9a2acb3e9d6803854f43b63daec22f89bcc88d43 (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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
$NetBSD: patch-ab,v 1.12 2014/12/15 08:58:52 obache Exp $

--- configure.orig	2012-08-15 11:45:19.000000000 +0000
+++ configure
@@ -3794,12 +3794,12 @@ static char *f (char * (*g) (char **, in
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
    that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+int osf4_cc_array ['\x00' = 0 ? 1 : -1];
 
 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
    inside strings and character constants.  */
 #define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+int xlc6_cc_array[FOO(a) = 'x' ? 1 : -1];
 
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
@@ -6006,7 +6006,7 @@ if test "${enable_double_buffer+set}" = 
   enableval=$enable_double_buffer;
 else
 
-  if test "x$xc_with_GL" == "x" ; then
+  if test "x$xc_with_GL" = "x" ; then
     $as_echo "#define DOUBLEBUFFER 1" >>confdefs.h
 
   else
@@ -6223,7 +6223,7 @@ xc_with_tk_libraries=""
 if test "${with_tcl+set}" = set; then :
   withval=$with_tcl;
   xc_with_tcl=$withval
-  if test "$withval" == "no" -o "$withval" == "NO"; then
+  if test "$withval" = "no" -o "$withval" = "NO"; then
       xc_with_tcl=""
   fi
 
@@ -6625,12 +6625,12 @@ if test "x$xc_with_tcl" != "x" ; then
   if test "x${xc_with_tcl_includes}" != "x" ; then
     if test -r "${xc_with_tcl_includes}/tcl.h" ; then
       TCL_INC_DIR=${xc_with_tcl_includes}
-    elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
+    elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
       echo "Can't find tcl.h in \"${xc_with_tcl_includes}\""
       echo "Reverting to non-Tcl compilation"
       xc_with_tcl=""
     fi
-  elif test "x${TCL_INCLUDE_SPEC}" == "x" ; then
+  elif test "x${TCL_INCLUDE_SPEC}" = "x" ; then
     for dir in \
      ${TCL_PREFIX}/include/tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} \
      ${TCL_PREFIX}/include \
@@ -6689,8 +6689,8 @@ if test "x$xc_with_tcl" != "x" ; then
       TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
       ;;
     *)
-      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}"
-      TK_LIB_NAME="tk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}"
+      TCL_LIB_NAME="tcl${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}"
+      TK_LIB_NAME="tk${TK_MAJOR_VERSION}${TK_MINOR_VERSION}"
       ;;
   esac