Re: Emacs 22.1 fails to build under GNU/Linux on S/390x due to multilib assumption

[Glenn Morris]

Mike Frysinger wrote:

>  - for $host_cpu == s390x, check /usr/lib64/ and then /usr/lib/

So in other words, for Emacs 22.2 we can just do for s390x what we
already do for amd64?

Could someone confirm if this works:


*** configure.in      7 Jan 2008 08:53:18 -0000 1.444.2.6
--- configure.in      16 Jan 2008 19:12:52 -0000
***************
*** 1532,1538 ****
  ### The standard library on x86-64 GNU/Linux distributions can 
  ### be located in either /usr/lib64 or /usr/lib.
  case "${canonical}" in
!   x86_64-*-linux-gnu* )
      if test -d /usr/lib64; then
        AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
          [Define to 1 if the file /usr/lib64 exists.])
--- 1532,1538 ----
  ### The standard library on x86-64 GNU/Linux distributions can 
  ### be located in either /usr/lib64 or /usr/lib.
  case "${canonical}" in
!   x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
      if test -d /usr/lib64; then
        AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
          [Define to 1 if the file /usr/lib64 exists.])


*** ibms390x.h 8 Jan 2008 04:04:33 -0000 1.4.2.3
--- ibms390x.h 16 Jan 2008 19:11:41 -0000
***************
*** 161,170 ****
--- 161,178 ----
  #define XPNTR(a) XUINT (a)
  
  #undef START_FILES
+ #ifdef HAVE_X86_64_LIB64_DIR
  #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+ #else
+ #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+ #endif
  
  #undef LIB_STANDARD
+ #ifdef HAVE_X86_64_LIB64_DIR
  #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+ #else
+ #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+ #endif
  
  /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
     (do not change this comment) */