From 6c3dc798c0d2535d572753c068e98dc4697f8dec Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Thu, 22 Sep 2005 00:05:40 +0000 Subject: fix a broken configure script which tries to compile something with multiple #include's on the same line. Should fix recently noted compile problems on NetBSD-1.6.2. --- math/scilab/distinfo | 6 +++--- math/scilab/patches/patch-aa | 14 ++++++++++++-- math/scilab/patches/patch-ab | 22 ++++++++++++++++------ 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/math/scilab/distinfo b/math/scilab/distinfo index b334100b471..77125b1e963 100644 --- a/math/scilab/distinfo +++ b/math/scilab/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.18 2005/09/07 10:48:47 dmcmahill Exp $ +$NetBSD: distinfo,v 1.19 2005/09/22 00:05:40 dmcmahill Exp $ SHA1 (scilab-3.1.1-src.tar.gz) = 63cae13441befb795d32cec5f825042b6b4e74b3 RMD160 (scilab-3.1.1-src.tar.gz) = 363486c6c9d1e64a28edcd002651e3c9d3b1eb73 Size (scilab-3.1.1-src.tar.gz) = 14261772 bytes -SHA1 (patch-aa) = c07d4817a3e8ad0b7291709a84937d6f28a1e122 -SHA1 (patch-ab) = edfd155402a07931d51d849781ec679f3f9c7c27 +SHA1 (patch-aa) = 6d9749330ba4471de03a2873daee5b9fdc0aac06 +SHA1 (patch-ab) = 5119dcbfdf987e7303446b06c9126137e740e1b8 SHA1 (patch-ac) = 0c48500eb261d643bdd5c1d34d23968b312eae57 SHA1 (patch-ad) = 186b5b1b71ccd983f49ae4c1bfb45152d4ebd662 SHA1 (patch-ae) = 050ea8847196c2808a74c252db7c98d77677cd25 diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa index 9e5d03836fa..37de031a66b 100644 --- a/math/scilab/patches/patch-aa +++ b/math/scilab/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.10 2005/09/07 10:48:47 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.11 2005/09/22 00:05:40 dmcmahill Exp $ --- configure.in.orig 2005-05-25 15:00:45.000000000 +0000 +++ configure.in @@ -43,7 +43,17 @@ $NetBSD: patch-aa,v 1.10 2005/09/07 10:48:47 dmcmahill Exp $ FC_PICFLAGS='-fPIC' # check for --export-dynamic ac_save_LDFLAGS="$LDFLAGS" -@@ -1714,13 +1714,13 @@ case "$host" in +@@ -1413,7 +1413,8 @@ if test "$PERIFILE" = periX11.o; then + LDFLAGS="$ac_save_LDFLAGS" + save_cflags=$CFLAGS + CFLAGS="$X_CFLAGS $CC_OPTIONS" +- AC_TRY_COMPILE([#include #include ],,, ++ AC_TRY_COMPILE([#include ++ #include ],,, + AC_MSG_ERROR([Include file "ViewportP.h" for Xaw3d not found. + Get and put it in .])) + CFLAGS=$save_cflags +@@ -1714,13 +1715,13 @@ case "$host" in ;; esac diff --git a/math/scilab/patches/patch-ab b/math/scilab/patches/patch-ab index 63a66fdfcb1..8f4c061fd3a 100644 --- a/math/scilab/patches/patch-ab +++ b/math/scilab/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.9 2005/09/07 10:48:47 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.10 2005/09/22 00:05:40 dmcmahill Exp $ --- configure.orig 2005-05-25 15:00:45.000000000 +0000 +++ configure @@ -43,7 +43,17 @@ $NetBSD: patch-ab,v 1.9 2005/09/07 10:48:47 dmcmahill Exp $ FC_PICFLAGS='-fPIC' # check for --export-dynamic ac_save_LDFLAGS="$LDFLAGS" -@@ -25800,6 +25800,10 @@ CHK_TCL_MIN=$TCL_MINOR_VERSION +@@ -24208,7 +24208,8 @@ _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include #include ++#include ++#include + int + main () + { +@@ -25800,6 +25801,10 @@ CHK_TCL_MIN=$TCL_MINOR_VERSION TCL_LIB_OK=0 echo "$as_me:$LINENO: checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION" >&5 echo $ECHO_N "checking for tcl library tcl$TCL_MAJOR_VERSION.$TCL_MINOR_VERSION... $ECHO_C" >&6 @@ -54,7 +64,7 @@ $NetBSD: patch-ab,v 1.9 2005/09/07 10:48:47 dmcmahill Exp $ dirs="$USER_TCL_LIB_PATH /lib /usr/lib /usr/lib/tcl /usr/lib/tcl8.* /shlib /shlib/tcl /shlib/tcl8.* /usr/shlib /shlib/tcl /usr//shlib/tcl8.* /usr/local/lib /usr/local/lib/tcl /usr/local/lib/tcl8.* /usr/local/shlib /usr/X11/lib/tcl /usr/X11/lib/tcl8.* /usr/lib/X11 /usr/lib/X11/tcl /usr/lib/X11/tcl8.* ../lib ../../lib /usr/local/tcl /usr/tcl /usr/tcl/lib /usr/local/tcl/lib /sw/lib/ ." libexts="so so.1.0 sl dylib a" libnames="tcl$CHK_TCL_MAJ.$CHK_TCL_MIN tcl.$CHK_TCL_MAJ.$CHK_TCL_MIN tcl$CHK_TCL_MAJ$CHK_TCL_MIN tcl.$CHK_TCL_MAJ$CHK_TCL_MIN" -@@ -25966,7 +25970,7 @@ fi +@@ -25966,7 +25971,7 @@ fi done if test $TCL_LIB_OK = 1; then @@ -63,7 +73,7 @@ $NetBSD: patch-ab,v 1.9 2005/09/07 10:48:47 dmcmahill Exp $ break; fi fi -@@ -26098,6 +26102,10 @@ TK_LIB_OK=0 +@@ -26098,6 +26103,10 @@ TK_LIB_OK=0 echo "$as_me:$LINENO: checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION" >&5 echo $ECHO_N "checking for tk library tk$TK_MAJOR_VERSION.$TK_MINOR_VERSION... $ECHO_C" >&6 @@ -74,7 +84,7 @@ $NetBSD: patch-ab,v 1.9 2005/09/07 10:48:47 dmcmahill Exp $ dirs="$USER_TK_LIB_PATH /lib /usr/lib /usr/lib/tk /usr/lib/tk8.* /shlib /shlib/tk /shlib/tk8.* /usr/shlib /shlib/tk /usr/shlib/tk8.* /usr/local/lib /usr/local/lib/tk /usr/local/lib/tk8.* /usr/local/shlib /usr/X11/lib/tk /usr/X11/lib/tk8.* /usr/lib/X11 /usr/lib/X11/tk /usr/lib/X11/tk8.* ../lib ../../lib /usr/tk /usr/local/tk /usr/local/tk/lib /usr/tk/lib /usr/local/tcl /usr/tcl /usr/local/tcl/lib /usr/tcl/lib /sw/lib " libexts="so so.1.0 sl dylib a" libnames="tk$CHK_TK_MAJ.$CHK_TK_MIN tk.$CHK_TK_MAJ.$CHK_TK_MIN tk$CHK_TK_MAJ$CHK_TK_MIN tk.$CHK_TK_MAJ$CHK_TK_MIN" -@@ -26292,7 +26300,7 @@ echo "$as_me: error: header file tk.h h +@@ -26292,7 +26301,7 @@ echo "$as_me: error: header file tk.h h fi else @@ -83,7 +93,7 @@ $NetBSD: patch-ab,v 1.9 2005/09/07 10:48:47 dmcmahill Exp $ WITH_TKSCI=1 fi -@@ -26321,13 +26329,13 @@ case "$host" in +@@ -26321,13 +26330,13 @@ case "$host" in ;; esac -- cgit v1.2.3