Move LIBXMU from cpp to configure.

* configure.in (LIBXMU): New output variable.

* src/Makefile.in (LIBXMU): Set with configure, not cpp.
* src/s/aix4-2.h (LIBXMU):
* src/s/hpux10-20.h (LIBXMU):
Remove definition, now set in configure.

2 files changed, 2 insertions, 10 deletions

diff --git a/src/s/aix4-2.h b/src/s/aix4-2.h
index c14835531df..b6ef00a1fdb 100644
--- a/src/s/aix4-2.h
+++ b/src/s/aix4-2.h
@@ -136,8 +136,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef sigmask
 
 #ifndef HAVE_LIBXMU
-#define LIBXMU
-
 /* Unfortunately without libXmu we cannot support EditRes.  */
 #define NO_EDITRES
 #endif
@@ -153,8 +151,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    It is possible to completely override the malloc implementation on
    AIX, but that involves putting the malloc functions in a shared
    library and setting the MALLOCTYPE environment variable to point to
-   tha shared library.
-   
+   that shared library.
+
    Emacs currently calls xrealloc on the results of get_current_dir name,
    to avoid a crash just use the Emacs implementation for that function.
 */
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index 28030de8897..6573c6f4ad4 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -105,12 +105,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This triggers a conditional in xfaces.c.  */
 #define XOS_NEEDS_TIME_H
 
-#ifndef HAVE_LIBXMU
-/* HP-UX doesn't supply Xmu.  */
-#define LIBXMU
-
-#endif
-
 /* Assar Westerlund <assar@sics.se> says this is necessary for
    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
 #define NO_EDITRES