Index: /trunk/psconfig/pschecklibs
===================================================================
--- /trunk/psconfig/pschecklibs	(revision 19603)
+++ /trunk/psconfig/pschecklibs	(revision 19604)
@@ -2,4 +2,5 @@
 
 $tagsets = "tagsets";
+$needdev = 0;
 
 # default system library locations
@@ -127,10 +128,14 @@
     if ($line =~ m|^\s*\#|) { next; }
 
-    ($type, $name, $altnames, $altpaths, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts) = split (" ", $line);
-    if (($use_equals ne "Y") && ($use_equals ne "N")) { die "invalid value for use_equals field\n"; }
+    ($type, $name, $altnames, $altpaths, $tarball, $tardir, $auto_force, $configure_opts, $make_opts, $install_opts) = split (" ", $line);
+    if (($auto_force ne "Y") && ($auto_force ne "N")) { die "invalid value for auto_force field\n"; }
 
     if ((defined $force{lc($name)} or defined $force{'all'}) and lc($tarball) ne "none") {
-        &buildlib ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts);
-#       exit 0;
+        &buildlib ($name, $tarball, $tardir, $configure_opts, $make_opts, $install_opts);
+        next;
+    }
+
+    if ($build and ($auto_force eq "Y")) {
+        &buildlib ($name, $tarball, $tardir, $configure_opts, $make_opts, $install_opts);
         next;
     }
@@ -147,6 +152,15 @@
     }
 
+    if ($auto_force eq "Y") {
+	print "$name will be built\n";
+    }
+
     if ($found) {
-        print "pass $name ($found)\n";
+	if ($found eq "runtime-only") {
+	    print "runtime $name ($found)\n";
+	    push @faillibs, "$name";
+	} else {
+	    print "pass $name ($found)\n";
+	}
         next;
     } else {
@@ -155,4 +169,8 @@
     }
 
+    if ($auto_force eq "Y") {
+	print "$name will be built\n";
+    }
+
     if (! $build) { next; }
     if ($type eq "inc") {
@@ -160,5 +178,5 @@
         # Will attempt to install library.
     }
-    &buildlib ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts);
+    &buildlib ($name, $tarball, $tardir, $configure_opts, $make_opts, $install_opts);
 }
 if ($build) { exit 0; }
@@ -172,4 +190,8 @@
     print "\n";
     print "you may install them in your local path by re-running pschecklibs with -build\n";
+
+    print "*** WARNING *** Some libraries are installed in your system only for runtime use, not for linking.\n";
+    print " For many systems, it is possible to install the developer version of a library, and this may be safer\n";
+    print " If you choose to install our version of any of these libraries, please use -force (library) in your psbuild / pschecklibs options\n";
     exit 1;
 }
@@ -179,5 +201,5 @@
 
 sub buildlib {
-    my ($name, $tarball, $tardir, $use_equals, $configure_opts, $make_opts, $install_opts) = @_;
+    my ($name, $tarball, $tardir, $configure_opts, $make_opts, $install_opts) = @_;
 
     if ($tarball eq "NONE") {
@@ -278,23 +300,29 @@
         # versions libraries if we find only a .so.N without a matching
         # .so, we link this in the installed libdir
-        foreach $topdir ( @libpath ) {
-            foreach $subdir ( @subdirs ) {
-                if ($subdir eq ".") {
-                    $path = $topdir;
-                } else {
-                    $path = "$topdir/$subdir";
-                }
-                if (! -e $path) { next; }
-                @libnames = <$path/$tryname.$dlltype*>;
-                if (@libnames > 0) {
-                    $libname = @libnames[-1];
-                    # print "making link to numbered .$dlltype library $libdir/$f.$dlltype\n";
-                    symlink $libname, "$libdir/$f.$dlltype";
-                    if ($?) { exit 1; }
-                    return $libname;
-                }
-                # print "no $path/$tryname.$dlltype*\n";
-            }
-        }
+	# XXX this was probably a mistake to allow some systems to build without supplied libs
+	if (1) {
+	    foreach $topdir ( @libpath ) {
+		foreach $subdir ( @subdirs ) {
+		    if ($subdir eq ".") {
+			$path = $topdir;
+		    } else {
+			$path = "$topdir/$subdir";
+		    }
+		    if (! -e $path) { next; }
+		    @libnames = <$path/$tryname.$dlltype*>;
+		    if (@libnames > 0) {
+			$libname = @libnames[-1];
+			$needdev = 1;
+			# print " *** need developer version of $name\n";
+			return "runtime-only";
+
+			# XXX old option: link in existing library
+			# symlink $libname, "$libdir/$f.$dlltype";
+			# if ($?) { exit 1; }
+			# return $libname;
+		    }
+		}
+	    }
+	}
     }
     return 0;
Index: /trunk/psconfig/tagsets/ipp-2.7.libs
===================================================================
--- /trunk/psconfig/tagsets/ipp-2.7.libs	(revision 19603)
+++ /trunk/psconfig/tagsets/ipp-2.7.libs	(revision 19604)
@@ -13,25 +13,26 @@
 #   tarball name
 #   tar directory
+#   force install by default?
 #   configure options
 #   make options
 #   make install options
 
-lib libm                 NONE           NONE   NONE                     NONE             Y NONE NONE NONE
-lib libX11               NONE           NONE   NONE                     NONE             Y NONE NONE NONE
-lib libpthread           NONE           NONE   NONE                     NONE             Y NONE NONE NONE
-lib libncurses           curses,termcap NONE   ncurses-5.6.tar.gz       ncurses-5.6      Y NONE NONE NONE
+lib libm                 NONE           NONE   NONE                     NONE             N NONE NONE NONE
+lib libX11               NONE           NONE   NONE                     NONE             N NONE NONE NONE
+lib libpthread           NONE           NONE   NONE                     NONE             N NONE NONE NONE
+lib libncurses           curses,termcap NONE   ncurses-5.6.tar.gz       ncurses-5.6      N NONE NONE NONE
 lib libreadline          NONE           NONE   readline-5.2-p12.tar.gz  readline-5.2-p12 Y NONE NONE NONE
-lib libz                 NONE           NONE   zlib-1.2.3.tar.gz        zlib-1.2.3       Y --shared NONE NONE
-lib libpng               NONE           NONE   libpng-1.2.15.tar.gz     libpng-1.2.15    Y NONE NONE NONE
-lib libjpeg              NONE           jpeg   jpegsrc.v6b.tar.gz       jpeg-6b          Y --enable-shared NONE install-lib
-lib libcfitsio           NONE           NONE   cfitsio3090.tar.gz       cfitsio          Y NONE NONE NONE
-#lib libmysqlclient      NONE           mysql  mysql-5.0.27.tar.gz      mysql-5.0.27     Y NONE NONE NONE
-lib libmysqlclient       NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    Y NONE NONE NONE
-lib libgsl               NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         Y NONE NONE NONE
-lib libfftw3f            NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       Y --enable-float,--enable-shared,--disable-fortran NONE NONE
-#lib libfftw3            NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       Y --enable-shared,--disable-fortran NONE NONE
+lib libz                 NONE           NONE   zlib-1.2.3.tar.gz        zlib-1.2.3       N --shared NONE NONE
+lib libpng               NONE           NONE   libpng-1.2.15.tar.gz     libpng-1.2.15    N NONE NONE NONE
+lib libjpeg              NONE           jpeg   jpegsrc.v6b-p1.tgz       jpeg-6b          N --enable-shared NONE install-lib
+lib libcfitsio           NONE           NONE   cfitsio3090.tar.gz       cfitsio          N NONE NONE NONE
+#lib libmysqlclient      NONE           mysql  mysql-5.0.27.tar.gz      mysql-5.0.27     N NONE NONE NONE
+lib libmysqlclient       NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    N NONE NONE NONE
+lib libgsl               NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE
+lib libfftw3f            NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       N --enable-float,--enable-shared,--disable-fortran NONE NONE
+#lib libfftw3            NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       N --enable-shared,--disable-fortran NONE NONE
 # paul claims we are not currently using double-point FFTs anywhere
 
-bin pkg-config           NONE           NONE   pkg-config-0.22.tar.gz   pkg-config-0.22  Y NONE NONE NONE
+bin pkg-config           NONE           NONE   pkg-config-0.22.tar.gz   pkg-config-0.22  N NONE NONE NONE
 
 inc X11/Xatom.h          NONE           NONE   NONE                     NONE             N NONE NONE NONE 
@@ -48,22 +49,22 @@
 inc errno.h              NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc fcntl.h              NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc fftw3.h              NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       Y --enable-float,--enable-shared,--disable-fortran NONE NONE
-inc fitsio.h             NONE           NONE   cfitsio3090.tar.gz       cfitsio          Y NONE NONE NONE
+inc fftw3.h              NONE           NONE   fftw-3.0.1.tar.gz        fftw-3.0.1       N --enable-float,--enable-shared,--disable-fortran NONE NONE
+inc fitsio.h             NONE           NONE   cfitsio3090.tar.gz       cfitsio          N NONE NONE NONE
 inc glob.h               NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc gsl/gsl_randist.h    NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         Y NONE NONE NONE 
-inc gsl/gsl_rng.h        NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         Y NONE NONE NONE 
+inc gsl/gsl_randist.h    NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE 
+inc gsl/gsl_rng.h        NONE           NONE   gsl-1.11.tar.gz          gsl-1.11         N NONE NONE NONE 
 inc inttypes.h           NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc jpeglib.h            NONE           jpeg   jpegsrc.v6b.tar.gz       jpeg-6b          Y --enable-shared NONE install-lib
+inc jpeglib.h            NONE           jpeg   jpegsrc.v6b.tar.gz       jpeg-6b          N --enable-shared NONE install-lib
 inc limits.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc malloc.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc math.h               NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc memory.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc mysql.h              NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    Y NONE NONE NONE
+inc mysql.h              NONE           mysql  mysql-5.0.51a.tar.gz     mysql-5.0.51a    N NONE NONE NONE
 inc netdb.h              NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc netinet/ip.h         NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc png.h                NONE           NONE   libpng-1.2.15.tar.gz     libpng-1.2.15    Y NONE NONE NONE
+inc png.h                NONE           NONE   libpng-1.2.15.tar.gz     libpng-1.2.15    N NONE NONE NONE
 inc pthread.h            NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc readline/history.h   NONE           NONE   readline-5.2-p12.tar.gz  readline-5.2-p12 Y NONE NONE NONE
-inc readline/readline.h  NONE           NONE   readline-5.2-p12.tar.gz  readline-5.2-p12 Y NONE NONE NONE
+inc readline/history.h   NONE           NONE   readline-5.2-p12.tar.gz  readline-5.2-p12 N NONE NONE NONE
+inc readline/readline.h  NONE           NONE   readline-5.2-p12.tar.gz  readline-5.2-p12 N NONE NONE NONE
 inc regex.h              NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc signal.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 
@@ -84,5 +85,5 @@
 inc time.h               NONE           NONE   NONE                     NONE             N NONE NONE NONE 
 inc unistd.h             NONE           NONE   NONE                     NONE             N NONE NONE NONE 
-inc zlib.h               NONE           NONE   zlib-1.2.3.tar.gz        zlib-1.2.3       Y --shared NONE NONE
+inc zlib.h               NONE           NONE   zlib-1.2.3.tar.gz        zlib-1.2.3       N --shared NONE NONE
 
 # xml is currently not used by IPP
