Update autoconf and libtool files

configure.ac

@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl This config.in requires autoconf 2.5 or greater.
 
-AC_PREREQ(2.60)
-AC_INIT(qpdf,2.3.1)
+AC_PREREQ([2.69])
+AC_INIT([qpdf],[2.3.1])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_FILES([autoconf.mk])
@@ -13,7 +13,6 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_HEADER_STDC
 LT_INIT([win32-dll])
-AC_PROG_LIBTOOL
 
 USE_EXTERNAL_LIBS=0
 AC_MSG_CHECKING(for whether to use external libraries distribution)
@@ -67,9 +66,11 @@ AC_MSG_CHECKING(for whether $CC supports -MD -MF x.dep -MP)
 oCFLAGS=$CFLAGS
 rm -f x.dep
 CFLAGS="$CFLAGS -MD -MF x.dep -MP"
-AC_TRY_COMPILE([#include <stdio.h>], [FILE* a = stdout],
-	       qpdf_DEPFLAGS=yes,
-	       qpdf_DEPFLAGS=no)
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+                    [[#include <stdio.h>]], [[FILE* a = stdout]]
+                  )],
+                  [qpdf_DEPFLAGS=yes],
+                  [qpdf_DEPFLAGS=no])
 CFLAGS=$oCFLAGS
 if test "$qpdf_DEPFLAGS" = "yes"; then
    if ! grep stdio.h x.dep >/dev/null 2>&1; then
@@ -98,9 +99,8 @@ if test "$BUILDRULES" != "msvc"; then
    AC_MSG_CHECKING(for whether $CC supports -Wall)
    oCFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -Wall"
-   AC_TRY_COMPILE([], [int a = 1; int b = a; a = b;],
-		  qpdf_USE_WALL=1,
-		  qpdf_USE_WALL=0)
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int a = 1; int b = a; a = b;]])],
+                     [qpdf_USE_WALL=1],[qpdf_USE_WALL=0])
    if test "$qpdf_USE_WALL" = "1"; then
       AC_MSG_RESULT(yes)
       CXXFLAGS="$CXXFLAGS -Wall"
@@ -326,4 +326,4 @@ if test "$USE_EXTERNAL_LIBS" = "1"; then
    LIBS="$LIBS -lz -lpcre"
 fi
 
-AC_OUTPUT()
+AC_OUTPUT

install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then