Makefile.am    |    4 ++--
 Makefile.in    |    4 ++--
 pcre-config.in |   14 ++------------
 pcretest.c     |    2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ec4b479..c7b82ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -245,13 +245,13 @@ dist_noinst_SCRIPTS += RunTest
 EXTRA_DIST += RunTest.bat
 bin_PROGRAMS += pcretest
 pcretest_SOURCES = pcretest.c
-pcretest_LDADD = libpcreposix.la
+pcretest_LDADD = libpcreposix.la libpcre.la
 
 TESTS += RunGrepTest
 dist_noinst_SCRIPTS += RunGrepTest
 bin_PROGRAMS += pcregrep
 pcregrep_SOURCES = pcregrep.c
-pcregrep_LDADD = libpcreposix.la
+pcregrep_LDADD = libpcreposix.la libpcre.la
 
 EXTRA_DIST += \
   testdata/grepinput \
diff --git a/Makefile.in b/Makefile.in
index 526bbb4..0e2e63e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -506,9 +506,9 @@ libpcreposix_la_LIBADD = libpcre.la
 @WITH_PCRE_CPP_TRUE@pcre_stringpiece_unittest_SOURCES = pcre_stringpiece_unittest.cc
 @WITH_PCRE_CPP_TRUE@pcre_stringpiece_unittest_LDADD = libpcrecpp.la
 pcretest_SOURCES = pcretest.c
-pcretest_LDADD = libpcreposix.la
+pcretest_LDADD = libpcreposix.la libpcre.la
 pcregrep_SOURCES = pcregrep.c
-pcregrep_LDADD = libpcreposix.la
+pcregrep_LDADD = libpcreposix.la libpcre.la
 
 # A PCRE user submitted the following addition, saying that it "will allow
 # anyone using the 'mingw32' compiler to simply type 'make pcre.dll' and get a
diff --git a/pcre-config.in b/pcre-config.in
index 3b52101..7933cd4 100644
--- a/pcre-config.in
+++ b/pcre-config.in
@@ -12,16 +12,6 @@ if test $# -eq 0; then
       exit 1
 fi
 
-libR=
-case `uname -s` in
-  *SunOS*)
-  libR=" -R@libdir@"
-  ;;
-  *BSD*)
-  libR=" -Wl,-R@libdir@"
-  ;;
-esac
-
 while test $# -gt 0; do
   case "$1" in
   -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
@@ -55,10 +45,10 @@ while test $# -gt 0; do
       echo $includes
       ;;
     --libs-posix)
-      echo -L@libdir@$libR -lpcreposix -lpcre
+      echo -lpcreposix -lpcre
       ;;
     --libs)
-      echo -L@libdir@$libR -lpcre
+      echo -lpcre
       ;;
     *)
       echo "${usage}" 1>&2
diff --git a/pcretest.c b/pcretest.c
index d31bf3c..81ef6bf 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -806,7 +806,7 @@ options, followed by a set of test data, terminated by an empty line. */
 int main(int argc, char **argv)
 {
 FILE *infile = stdin;
-int options = 0;
+long int options = 0;
 int study_options = 0;
 int op = 1;
 int timeit = 0;