Index: ossp-pkg/snmpdx/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/Makefile.in,v
rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/snmpdx/Makefile.in,v' 2>/dev/null
--- Makefile.in	2003/09/19 10:33:14	1.12
+++ Makefile.in	2004/07/30 09:30:04	1.13
@@ -46,6 +46,7 @@
 datadir       = @datadir@
 localstatedir = @localstatedir@
 snmpmibdir    = @snmpmibdir@
+openpkg       = @openpkg@
 
 DESTDIR       =
 
@@ -65,6 +66,7 @@
 		-e "s;\@datadir\@;$(datadir);" \
 		-e "s;\@localstatedir\@;$(localstatedir);" \
 		-e "s;\@snmpmibdir\@;$(snmpmibdir);" \
+		-e "s;\@openpkg\@;$(openpkg);" \
 		<snmpdx.pl >snmpdx && \
 		chmod a+x snmpdx
 
@@ -75,6 +77,7 @@
 		-e 's;\@datadir\@;$(datadir);g' \
 		-e 's;\@localstatedir\@;$(localstatedir);g' \
 		-e "s;\@snmpmibdir\@;$(snmpmibdir);" \
+		-e "s;\@openpkg\@;$(openpkg);" \
 		<snmpdx.cfg.in >snmpdx.cfg
 
 snmpdx.8: snmpdx.pod
Index: ossp-pkg/snmpdx/README
RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/README,v
rcsdiff -q -kk '-r1.14' '-r1.15' -u '/v/ossp/cvs/ossp-pkg/snmpdx/README,v' 2>/dev/null
--- README	2004/07/28 13:42:01	1.14
+++ README	2004/07/30 09:30:04	1.15
@@ -50,6 +50,7 @@
     $ ./devtool autogen #optional
     $ PREFIX=/openpkg-dev; ./configure \
         --prefix=$PREFIX \
+        --with-openpkg=$PREFIX \
         --with-snmp=$PREFIX \
         --with-perl=$PREFIX/bin/perl
     $ make
Index: ossp-pkg/snmpdx/configure.ac
RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/configure.ac,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/snmpdx/configure.ac,v' 2>/dev/null
--- configure.ac	2003/09/10 14:17:05	1.5
+++ configure.ac	2004/07/30 09:30:04	1.6
@@ -32,9 +32,41 @@
 dnl # standard OSSP style header
 V=`./shtool version -ltxt -dlong VERSION`
 ./shtool echo -e "Configuring %BOSSP snmpdx%b, Version %B${V}%b"
-echo "Copyright (c) 2003 Ralf S. Engelschall <rse@engelschall.com>"
-echo "Copyright (c) 2003 The OSSP Project <http://www.ossp.org/>"
-echo "Copyright (c) 2003 Cable & Wireless <http://www.cw.com/>"
+echo "Copyright (c) 2003-2004 Ralf S. Engelschall <rse@engelschall.com>"
+echo "Copyright (c) 2003-2004 The OSSP Project <http://www.ossp.org/>"
+echo "Copyright (c) 2003-2004 Cable & Wireless <http://www.cw.com/>"
+
+dnl # check for OpenPKG
+AC_MSG_CHECKING(for openpkg instance)
+AC_ARG_WITH(openpkg,dnl
+[  --with-openpkg=PATH     force the use of a particular OpenPKG instance],
+with_openpkg="$withval",
+dnl # find any OpenPKG 2.x
+if test ".$with_openpkg" = .; then
+    for i in `cat </etc/openpkg` /openpkg; do
+        if test -x $i/bin/openpkg -a -x $i/libexec/openpkg/rpm; then
+            with_openpkg="$i"
+            break;
+        fi
+    done
+fi
+dnl # find any OpenPKG 1.x
+if test ".$with_openpkg" = .; then
+    for i in `cat </etc/openpkg` /cw; do
+        if test -x $i/bin/rpm -a ! -x $i/libexec/openpkg/rpm; then
+            with_openpkg="$i"
+            break;
+        fi
+    done
+fi
+dnl # take first configured
+if test ".$with_openpkg" = .; then
+    with_openpkg="`sed </etc/openpkg -n -e 1p`"
+fi
+)dnl
+openpkg="$with_openpkg"
+AC_SUBST(openpkg)
+AC_MSG_RESULT($openpkg)
 
 dnl # check for Perl
 AC_MSG_CHECKING(for perl program)
Index: ossp-pkg/snmpdx/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/devtool.conf,v
rcsdiff -q -kk '-r1.6' '-r1.7' -u '/v/ossp/cvs/ossp-pkg/snmpdx/devtool.conf,v' 2>/dev/null
--- devtool.conf	2004/07/30 09:20:10	1.6
+++ devtool.conf	2004/07/30 09:30:04	1.7
@@ -13,8 +13,9 @@
 %configure
     ./configure \
         --prefix=/tmp/snmpdx \
-        --with-perl=/cw/bin/perl \
-        --with-snmp=/cw \
+        --with-openpkg=/openpkg \
+        --with-snmp=/openpkg \
+        --with-perl=/openpkg/bin/perl \
         "$@"
 
 %release
Index: ossp-pkg/snmpdx/snmpdx.cfg.in
RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.cfg.in,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.cfg.in,v' 2>/dev/null
--- snmpdx.cfg.in	2003/09/10 14:17:05	1.4
+++ snmpdx.cfg.in	2004/07/30 09:30:04	1.5
@@ -2,7 +2,8 @@
 ##  snmpdx.cfg -- configuration file for SNMP Daemon Extension
 ##
 
-mibdir    @datadir@/snmpdx:@snmpmibdir@
-probedir  @libexecdir@/snmpdx
-logfile   @localstatedir@/snmpdx/snmpdx.log
+mibdir    "@datadir@/snmpdx:@snmpmibdir@"
+probedir  "@libexecdir@/snmpdx"
+logfile   "@localstatedir@/snmpdx/snmpdx.log"
+openpkg   "@openpkg@"
 
Index: ossp-pkg/snmpdx/snmpdx.pl
RCS File: /v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.pl,v
rcsdiff -q -kk '-r1.14' '-r1.15' -u '/v/ossp/cvs/ossp-pkg/snmpdx/snmpdx.pl,v' 2>/dev/null
--- snmpdx.pl	2004/07/30 09:27:21	1.14
+++ snmpdx.pl	2004/07/30 09:30:04	1.15
@@ -495,6 +495,7 @@
     'logfile'   => "@localstatedir@/snmpdx.log",
     'loglevel'  => 9,
     'strict'    => 0,
+    'openpkg'   => "@openpkg@",
 };
 
 #   command line parsing
@@ -514,6 +515,7 @@
     'l|logfile=s'   => \$opt->{'logfile'},
     'L|loglevel=i'  => \$opt->{'loglevel'},
     'S|strict'      => \$opt->{'strict'},
+    'O|openpkg'     => \$opt->{'openpkg'},
 );
 Getopt::Long::Configure("bundling");
 my $result = GetOptions(%options) || die "option parsing failed";
@@ -534,7 +536,8 @@
           " -m,--mibname=MIB    the name of the MIB to act under\n" .
           " -l,--logfile=PATH   path to daemon logfile\n" .
           " -L,--loglevel=NUM   logging level (0...9)\n" .
-          " -S,--strict         strict processing of unknown values\n";
+          " -S,--strict         strict processing of unknown values\n" .
+          " -O,--openpkg        OpenPKG instance to use for swOp, swBind\n";
     exit(0);
 }
 if ($opt->{'version'}) {