1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

Revert back to using original version of the configure script

* IBM i rpmbuild environments set the magic variables for
	  building w/ 64-bit binutils automatically, and one can
	  set this for themselves with `OBJECT_MODE=64` when
	  buildings. Remove this.

	* The subdir-objects change will need to be made due to
	  upstream autotools making it mandatory in the future, but
	  that isn't my decision to make.
This commit is contained in:
Calvin Buckley 2018-11-25 15:00:34 +00:00
parent a634b34ba4
commit bed0a3309f

View File

@ -5,7 +5,7 @@ AC_PREREQ(2.50)
AC_CONFIG_HEADERS([irssi-config.h]) AC_CONFIG_HEADERS([irssi-config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.9 no-define foreign subdir-objects]) AM_INIT_AUTOMAKE([1.9 no-define foreign])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
@ -199,12 +199,6 @@ case "$host_os" in
hpux*) hpux*)
CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED" CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED"
;; ;;
os400*)
dnl IBM i uses ppc64 gcc by default, but binutils defaults to 32-bit. Force
dnl IBM binutils, and force it into ppc64 mode. This isn't set for AIX
dnl because gcc there defaults to ppc32.
AR="/usr/bin/ar -X64"
;;
*) *)
;; ;;
esac esac