various ELF fixes.

- Make sure -Rpath is done correctly
- Make sure qt libs are found
- Make sure -lz -lpng -lSM are included as libqt needs functions
  from these libraries.

4 files changed, 45 insertions, 9 deletions

diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 278bc0e3e8b..6e4306f037a 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/01 05:40:52 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2000/04/01 18:53:59 dmcmahill Exp $
 #
 
 DISTNAME=	vipec-2.0.1
@@ -14,7 +14,8 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_X11=	yes
 
-CONFIGURE_ENV+=		"QTDIR=${X11BASE}/qt2"
+CONFIGURE_ENV+=	"QTDIR=${X11BASE}/qt2" \
+		all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS+=	"--with-qt-dir=${X11BASE}/qt2"
 
 post-extract:
diff --git a/cad/vipec/files/patch-sum b/cad/vipec/files/patch-sum
index 1028cf21819..df25a117e08 100644
--- a/cad/vipec/files/patch-sum
+++ b/cad/vipec/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/03/28 21:48:42 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.5 2000/04/01 18:54:00 dmcmahill Exp $
 
-MD5 (patch-aa) = ac3edc84e02d40220306c8452aaaf561
+MD5 (patch-aa) = 5a621d4a4a240fbb447a1e2d073bdb99
 MD5 (patch-ab) = 9649e880bbc32ea70e78fc1cfca0916e
-MD5 (patch-ac) = f53478bfdccbaa1a8e81ce2a8ac69d9f
+MD5 (patch-ac) = f39680bc2b4a9bdb9b4d1d1a2cf3e5c5
 MD5 (patch-ad) = 9ad5068ca9710e3f1a88706508971d10
diff --git a/cad/vipec/patches/patch-aa b/cad/vipec/patches/patch-aa
index 163ca3f55da..4428c9490c8 100644
--- a/cad/vipec/patches/patch-aa
+++ b/cad/vipec/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2000/03/28 21:48:42 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 2000/04/01 18:54:00 dmcmahill Exp $
 
 --- configure.orig	Wed Oct 27 19:59:43 1999
-+++ configure	Mon Mar 27 19:29:18 2000
++++ configure	Sat Apr  1 13:33:09 2000
 @@ -10,5 +10,5 @@
  # Defaults:
  ac_help=
@@ -16,3 +16,31 @@ $NetBSD: patch-aa,v 1.4 2000/03/28 21:48:42 dmcmahill Exp $
 +exec_prefix=NONE
  host=NONE
  no_create=
+@@ -1027,5 +1027,5 @@
+   X_LDFLAGS=""
+   x_libraries="/usr/lib";  else
+-  X_LDFLAGS="-L$x_libraries"
++  X_LDFLAGS="-L$x_libraries -Wl,-R$x_libraries"
+ fi
+ all_includes="$all_includes $X_INCLUDES"  
+@@ -2178,5 +2178,5 @@
+ 
+ CXXFLAGS="$CXXFLAGS -I$qt_incdir"
+-LDFLAGS="-L$qt_libdir $X_LDFLAGS"
++LDFLAGS="-L$qt_libdir -Wl,-R$qt_libdir $X_LDFLAGS"
+ LIBS="$LIBS -lqt -lXext -lX11 $LIBSOCKET"
+ 
+@@ -2266,5 +2266,5 @@
+ CXXFLAGS="$CXXFLAGS -I$qt_includes"
+ LDFLAGS="$X_LDFLAGS"
+-LIBS="-lqt -lXext -lX11 $LIBSOCKET"
++LIBS="-lqt -lXext -lX11 -lz -lpng -lSM $LIBSOCKET"
+ LD_LIBRARY_PATH=
+ export LD_LIBRARY_PATH
+@@ -2335,5 +2335,5 @@
+  QT_LDFLAGS=""
+ else
+- QT_LDFLAGS="-L$qt_libraries"
++ QT_LDFLAGS="-L$qt_libraries -Wl,-R$qt_libraries"
+  all_libraries="$QT_LDFLAGS $all_libraries"
+ fi
diff --git a/cad/vipec/patches/patch-ac b/cad/vipec/patches/patch-ac
index 6903b234d51..bbb02461a1b 100644
--- a/cad/vipec/patches/patch-ac
+++ b/cad/vipec/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2000/03/28 21:48:42 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2000/04/01 18:54:00 dmcmahill Exp $
 
 --- vipec/Makefile.in.orig	Wed Oct 27 20:01:06 1999
-+++ vipec/Makefile.in	Mon Mar 27 20:13:59 2000
++++ vipec/Makefile.in	Sat Apr  1 13:43:49 2000
 @@ -89,5 +89,5 @@
  LIBSOCKET = @LIBSOCKET@
  LIBTIFF = @LIBTIFF@
@@ -9,3 +9,10 @@ $NetBSD: patch-ac,v 1.1 2000/03/28 21:48:42 dmcmahill Exp $
 +#LIBTOOL = @LIBTOOL@
  LIBUCB = @LIBUCB@
  LIBUTIL = @LIBUTIL@
+@@ -158,5 +158,5 @@
+ bin_PROGRAMS = vipec 
+ vipec_SOURCES = drawingframe.cpp circuiteditor.cpp vipec.cpp view.cpp vector.cpp utils.cpp twoports.cpp table.cpp smith.cpp smallmatrix.cpp setup.cpp parser.cpp paramset.cpp netanal.cpp matrix.cpp main.cpp graphutils.cpp graph.cpp convert.cpp config.cpp block.cpp analyser.cpp 
+-vipec_LDADD = -lqt -lXext -lX11 $(LIBSOCKET)
++vipec_LDADD = -lqt -lXext -lX11 -lz -lpng -lSM $(LIBSOCKET)
+ 
+ SUBDIRS = images ckt help