diff options
-rw-r--r-- | Makefile.version | 2 | ||||
-rwxr-xr-x | buildtools/configure.pl | 5 | ||||
-rw-r--r-- | doc/HISTORY | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version index 4cd8e16e..f0a02711 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 39 -NETPBM_POINT_RELEASE = 03 +NETPBM_POINT_RELEASE = 04 diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 97e3c33f..3a0592ad 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -241,8 +241,11 @@ sub testCompileLink($$$) { print $cFile @{$cSourceCodeR}; my ($oFile, $oFileName) = tempFile(''); + + # Note that $flags may contain -l options, which where static linking + # is involved have to go _after_ the base object file ($oFileName). - my $compileCommand = "$testCc -o $oFileName $flags $cFileName"; + my $compileCommand = "$testCc -o $oFileName $cFileName $flags"; print ("Doing test compile/link: $compileCommand\n"); my $rc = system($compileCommand); diff --git a/doc/HISTORY b/doc/HISTORY index 479c033a..000c4211 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,10 @@ Netpbm. CHANGE HISTORY -------------- +07.08.18 BJH Release 10.39.04 + + Build: put -l's after .o's in test links. + 07.08.01 BJH Release 10.39.03 pnmtops: fix crash when program attempts to write 12 bits per |