@@ -47,12 +47,13 @@
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
-		AC_SUBST(OBJFW_AMIGA_LIB, objfw68k.library)
-		AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt68k.library)
+		AC_SUBST(OBJFW_AMIGA_LIB, 'objfw${OBJFW_LIB_MAJOR}.library')
+		AC_SUBST(OBJFWRT_AMIGA_LIB,
+			['objfwrt${OBJFWRT_LIB_MAJOR}.library'])
 		dnl For 68000, GCC emits calls to helper functions that
 		dnl do not work properly in a library.
 		t="-mcpu=68020 -fbaserel32 -noixemul -ffreestanding"
 		AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 		t="$t -resident32 -nostartfiles -nodefaultlibs -ldebug -lc"
@@ -79,12 +80,14 @@
 	enable_files="yes"	# Required for reading ENV:
 	enable_shared="no"
 	supports_amiga_lib="yes"
 
 	AS_IF([test x"$enable_amiga_lib" != x"no"], [
-		AC_SUBST(OBJFW_AMIGA_LIB, objfw.library)
-		AC_SUBST(OBJFWRT_AMIGA_LIB, objfwrt.library)
+		AC_SUBST(OBJFW_AMIGA_LIB,
+			['objfw${OBJFW_LIB_MAJOR}ppc.library'])
+		AC_SUBST(OBJFWRT_AMIGA_LIB,
+			['objfwrt${OBJFWRT_LIB_MAJOR}ppc.library'])
 		t="-mresident32 -ffreestanding -noixemul"
 		AC_SUBST(AMIGA_LIB_CFLAGS, $t)
 		t="-mresident32 -nostartfiles -nodefaultlibs -noixemul"
 		t="$t -laboxstubs -labox -lmath -ldebug -lc"
 		AC_SUBST(AMIGA_LIB_LDFLAGS, $t)
@@ -159,11 +162,10 @@
 	;;
 esac
 AC_PROG_OBJC($potential_compilers)
 AC_PROG_OBJCPP
 AC_PROG_LN_S
-AC_PROG_INSTALL
 AC_PROG_EGREP
 
 BUILDSYS_CHECK_IOS
 
 AC_ARG_WITH(wii,
@@ -365,11 +367,10 @@
 AS_IF([test x"$enable_shared" != x"no"], [
 	BUILDSYS_SHARED_LIB
 	AC_SUBST(OBJFW_SHARED_LIB, "${LIB_PREFIX}objfw${LIB_SUFFIX}")
 	AC_SUBST(EXCEPTIONS_LIB_A, "exceptions.lib.a")
 	AC_SUBST(FORWARDING_LIB_A, "forwarding.lib.a")
-	AC_SUBST(INVOCATION_LIB_A, "invocation.lib.a")
 	AC_SUBST(LOOKUP_ASM_LIB_A, "lookup-asm.lib.a")
 
 	BUILDSYS_FRAMEWORK([
 		AC_SUBST(OBJFW_FRAMEWORK, "ObjFW.framework")
 		build_framework="yes"
@@ -398,45 +399,25 @@
 	TESTS_LIBS="\${OBJFW_LIBS} \${RUNTIME_LIBS} $TESTS_LIBS"
 	TESTS_LIBS="-L../src/runtime -L../src/runtime/linklib $TESTS_LIBS"
 	TESTS_LIBS="-L../src -L../src/linklib $TESTS_LIBS"
 ])
 
-AC_ARG_ENABLE(amiga-lib,
-	AS_HELP_STRING([--disable-amiga-lib], [do not build Amiga library]))
-AS_IF([test x"$supports_amiga_lib" != x"yes"], [enable_amiga_lib="no"])
-AS_IF([test x"$enable_amiga_lib" != x"no"], [
-	AC_SUBST(EXCEPTIONS_AMIGALIB_A, "exceptions.amigalib.a")
-	AC_SUBST(FORWARDING_AMIGALIB_A, "forwarding.amigalib.a")
-	AC_SUBST(INVOCATION_AMIGALIB_A, "invocation.amigalib.a")
-	AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a")
-])
-
 AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static library]))
 AS_IF([test x"$enable_shared" = x"no" -a x"$enable_amiga_lib" = x"no"], [
 	enable_static="yes"
 ])
 AS_IF([test x"$enable_static" = x"yes"], [
 	AC_SUBST(OBJFW_STATIC_LIB, "libobjfw.a")
 	AC_SUBST(EXCEPTIONS_A, "exceptions.a")
 	AC_SUBST(FORWARDING_A, "forwarding.a")
-	AC_SUBST(INVOCATION_A, "invocation.a")
 	AC_SUBST(LOOKUP_ASM_A, "lookup-asm.a")
 ])
 
 AS_IF([test x"$enable_amiga_lib" != x"no"], [
 	AC_SUBST(EXCEPTIONS_AMIGALIB_A, "exceptions.amigalib.a")
-	AC_SUBST(EXCEPTIONS_EXCEPTIONS_AMIGALIB_A,
-		"exceptions/exceptions.amigalib.a")
 	AC_SUBST(FORWARDING_AMIGALIB_A, "forwarding.amigalib.a")
-	AC_SUBST(FORWARDING_FORWARDING_AMIGALIB_A,
-		"forwarding/forwarding.amigalib.a")
-	AC_SUBST(INVOCATION_AMIGALIB_A, "invocation.amigalib.a")
-	AC_SUBST(INVOCATION_INVOCATION_AMIGALIB_A,
-		"invocation/invocation.amigalib.a")
 	AC_SUBST(LOOKUP_ASM_AMIGALIB_A, "lookup-asm.amigalib.a")
-	AC_SUBST(LOOKUP_ASM_LOOKUP_ASM_AMIGALIB_A,
-		"lookup-asm/lookup-asm.amigalib.a")
 ])
 
 AC_DEFINE_UNQUOTED(PLUGIN_SUFFIX, "$PLUGIN_SUFFIX", [Suffix for plugins])
 AS_IF([test x"$enable_files" != x"no" -a x"$PLUGIN_SUFFIX" != x""], [
 	AC_SUBST(USE_SRCS_PLUGINS, '${SRCS_PLUGINS}')
@@ -642,11 +623,11 @@
 	], [
 		AC_MSG_RESULT(exceptions unavailable!)
 		AC_MSG_ERROR([Exceptions not accepted by compiler!])
 	])
 
-	AC_SEARCH_LIBS($raise_exception, [c++abi gcc_s gcc], [
+	AC_SEARCH_LIBS($raise_exception, [c++abi gcc_s gcc unwind], [
 		dnl c++abi requires pthread on OpenBSD
 		AS_IF([test x"$ac_lib" = x"c++abi"], [LIBS="$LIBS -lpthread"])
 	], [
 		AC_MSG_ERROR([$raise_exception missing!])
 	], [-lpthread])
@@ -675,11 +656,18 @@
 
 	OBJCFLAGS="$old_OBJCFLAGS"
 	;;
 esac
 
-AC_CHECK_FUNCS(_Unwind_Backtrace)
+case "$host_os" in
+hpux*)
+	dnl _Unwind_Backtrace() returns complete garbage on HP-UX.
+	;;
+*)
+	AC_CHECK_FUNCS(_Unwind_Backtrace)
+	;;
+esac
 
 case "$host_os" in
 darwin*)
 	AC_SUBST(LDFLAGS_REEXPORT, ["-Wl,-reexport-lobjfw"])
 	AS_IF([test x"$objc_runtime" = x"Apple runtime"], [
@@ -967,11 +955,11 @@
 			CPPFLAGS="$CPPFLAGS -Wp,-pthread"
 		], [
 			CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_THREAD_SAFE"
 		])
 
-		AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread")
+		AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
 
 		AC_LINK_IFELSE([
 			AC_LANG_PROGRAM([
 				#include <pthread.h>
 			], [
@@ -1370,16 +1358,10 @@
 	])
 	AC_CHECK_HEADER(netinet/tcp.h, [
 		AC_DEFINE(OF_HAVE_NETINET_TCP_H, 1,
 			[Whether we have netinet/tcp.h])
 	])
-	AC_CHECK_HEADER(netinet/sctp.h, [
-		AC_DEFINE(OF_HAVE_SCTP, 1, [Whether we have SCTP])
-		AC_DEFINE(OF_HAVE_NETINET_SCTP_H, 1,
-			[Whether we have netinet/sctp.h])
-		AC_SUBST(USE_SRCS_SCTP, '${SRCS_SCTP}')
-	])
 	AC_CHECK_HEADERS([arpa/inet.h netdb.h])
 	AC_CHECK_HEADER(netipx/ipx.h, [
 		AC_DEFINE(OF_HAVE_NETIPX_IPX_H, 1,
 			[Whether we have netipx/ipx.h])
 	])
@@ -1556,11 +1538,10 @@
 
 	AC_SUBST(OFDNS, "ofdns")
 	AS_IF([test x"$enable_files" != x"no"], [
 		AC_SUBST(OFHTTP, "ofhttp")
 	])
-	AC_SUBST(OFSOCK, "ofsock")
 ])
 
 AC_DEFUN([CHECK_BUILTIN_BSWAP], [
 	AC_MSG_CHECKING(for __builtin_bswap$1)
 	AC_LINK_IFELSE([
@@ -1594,29 +1575,29 @@
 		    (!defined(TARGET_OS_SIMULATOR) || !TARGET_OS_SIMULATOR)
 		egrep_cpp_yes
 		#endif
 	], [
 		AC_MSG_RESULT(yes)
-		have_processes="yes"
+		have_subprocesses="yes"
 	], [
 		AC_MSG_RESULT(no)
-		have_processes="no"
+		have_subprocesses="no"
 	])
 	;;
 mingw*)
-	have_processes="yes"
+	have_subprocesses="yes"
 	;;
 msdosdjgpp*)
-	have_processes="no"
+	have_subprocesses="no"
 	;;
 *)
 	AC_HEADER_SYS_WAIT
 	AC_CHECK_FUNCS(kill)
 
 	AC_CHECK_FUNCS(posix_spawnp, [
 		AS_IF([test x"$ac_cv_func_kill" = x"yes"], [
-			have_processes="yes"
+			have_subprocesses="yes"
 
 			AC_CHECK_HEADERS(spawn.h)
 		])
 	], [
 		AC_CHECK_FUNCS([vfork dup2 execvp _exit], [
@@ -1624,21 +1605,21 @@
 			    -a x"$ac_cv_func_pipe" = x"yes" \
 			    -a x"$ac_cv_func_dup2" = x"yes" \
 			    -a x"$ac_cv_func_execvp" = x"yes" \
 			    -a x"$ac_cv_func_kill" = x"yes" \
 			    -a x"$ac_cv_func__exit" = x"yes"], [
-				have_processes="yes"
+				have_subprocesses="yes"
 			])
 		], [
 			break
 		])
 	])
 	;;
 esac
-AS_IF([test x"$have_processes" = x"yes"], [
-	AC_SUBST(OF_PROCESS_M, "OFProcess.m")
-	AC_DEFINE(OF_HAVE_PROCESSES, 1, [Whether we have processes])
+AS_IF([test x"$have_subprocesses" = x"yes"], [
+	AC_SUBST(OF_SUBPROCESS_M, "OFSubprocess.m")
+	AC_DEFINE(OF_HAVE_SUBPROCESSES, 1, [Whether we have subprocesses])
 ])
 
 AC_CHECK_HEADERS_ONCE([complex.h sys/ioctl.h sys/ttycom.h])
 AC_CHECK_FUNCS(isatty)