ok let's try that a different way

cooljeanius · Aug 23, 2023 · 7edf930 · 7edf930
1 parent a140404
commit 7edf930
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/emacs.yml b/.github/workflows/emacs.yml
@@ -13,7 +13,7 @@ jobs:
 #     # 'Transformers::TravisCI::Scripts::Dependencies' dependencies are currently unsupported
 #     # 'compiler' was not transformed because there is no suitable equivalent in GitHub Actions
     - run: sudo apt-get update -qq
-    - run: DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gobjc gobjc++ gobjc-multilib gobjc++-multilib autopoint libxmu
+    - run: DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gobjc gobjc++ gobjc-multilib gobjc++-multilib autopoint
     - run: sh ./autogen.sh && ./configure --without-makeinfo --without-gif --without-gnutls --enable-silent-rules --disable-autodepend --without-imagemagick --enable-gcc-warnings --with-x-toolkit=no --with-xpm=no --disable-openmp && make only_bootstrap-emacs
     strategy:
       matrix:

diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,7 @@ before_install:
   - "sudo apt-get update -qq"
 
 install:
-  - "DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gobjc gobjc++ gobjc-multilib gobjc++-multilib autopoint libxmu"
+  - "DEBIAN_FRONTEND=noninteractive sudo apt-get install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 libc-dev gcc make autoconf automake libncurses-dev gobjc gobjc++ gobjc-multilib gobjc++-multilib autopoint"
 
 script: sh ./autogen.sh && ./configure --without-makeinfo --without-gif --without-gnutls --enable-silent-rules --disable-autodepend --without-imagemagick --enable-gcc-warnings --with-x-toolkit=no --with-xpm=no --disable-openmp && make only_bootstrap-emacs
 

diff --git a/configure b/configure
@@ -50438,7 +50438,7 @@ fi
 printf "%s\n" "$as_me: skipping checks for Xt version" >&6;}
 fi
 
-LIBXMU='-lXmu'
+if test -e "${prefix}/lib/libXmu.a"; then LIBXMU='-lXmu'; else LIBXMU=""; fi
 case ${opsys} in
   ## These systems do NOT supply Xmu.
   hpux* | aix4-2 )

diff --git a/configure.ac b/configure.ac
@@ -7144,7 +7144,8 @@ AC_SUBST([LIBXMU])dnl
 
 dnl# FIXME: the logic here seems weird, but this is what cpp was doing.
 dnl# Why not just test for libxmu in the normal way?
-LIBXMU='-lXmu'
+dnl# ...or why not just test for it EVEN WEIRDERLY?!
+if test -e "${prefix}/lib/libXmu.a"; then LIBXMU='-lXmu'; else LIBXMU=""; fi
 case ${opsys} in
   ## These systems do NOT supply Xmu.
   hpux* | aix4-2 )