Release 10.35.13

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@124 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 16 insertions, 5 deletions

diff --git a/buildtools/configure.pl b/buildtools/configure.pl
index 3a44a0da..258d01b8 100755
--- a/buildtools/configure.pl
+++ b/buildtools/configure.pl
@@ -584,10 +584,12 @@ sub libSuffix($) {
 #-----------------------------------------------------------------------------
     my $suffix;
 
-    if ($platform eq "windows") {
-        $suffix = ".a";
+    if ($platform eq 'windows') {
+        $suffix = '.a';
+    } elsif ($platform= 'darwin') {
+        $suffix = '.dylib';
     } else {
-        $suffix = ".so";
+        $suffix = '.so';
     }
 }
 
@@ -1001,6 +1003,8 @@ sub getX11Library($@) {
             $default = '/usr/link/X11/libX11' . libSuffix($platform);
         } elsif (-d('/usr/lib/X11')) {
             $default = '/usr/lib/libX11' . libSuffix($platform);
+        } elsif (-d('/usr/X11R6')) {
+            $default = '/usr/X11R6/lib/libX11' . libSuffix($platform);
         } else {
             $default = "libX11" . libSuffix($platform);
         }
@@ -1976,7 +1980,7 @@ if ($platform eq "GNU") {
     push(@Makefile_config, 'CFLAGS_SHLIB = -fno-common', "\n");
     push(@Makefile_config, "LDSHLIB = ",
          "-dynamiclib ",
-         '-install_name $(NETPBM_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib', 
+         '-install_name $(NETPBMLIB_RUNTIME_PATH)/libnetpbm.$(MAJ).dylib', 
          "\n");
 #    push(@Makefile_config, "INSTALL = install\n");
 } else {
diff --git a/buildtools/installnetpbm.pl b/buildtools/installnetpbm.pl
index db3f6200..5987ea8b 100755
--- a/buildtools/installnetpbm.pl
+++ b/buildtools/installnetpbm.pl
@@ -311,12 +311,19 @@ execLdconfig() {
 
 
 
+sub ldconfigExists() {
+
+    return (system("ldconfig -? 2>/dev/null") >> 8) != 127;
+}
+
+
+
 sub
 doLdconfig() {
 #-----------------------------------------------------------------------------
 #  Run Ldconfig where appropriate.
 #-----------------------------------------------------------------------------
-    if ($OSNAME eq "linux" || system("ldconfig -? 2>/dev/null") != 127) {
+    if ($OSNAME eq "linux" || ldconfigExists()) {
         # This is a system where Ldconfig makes sense
 
         print("In order for the Netpbm shared library to be found when " .