From 29ceeb870d50074ff7b0ca8efad4d181e0415a37 Mon Sep 17 00:00:00 2001 From: kojima Date: Sun, 12 Nov 2000 03:28:56 +0000 Subject: [PATCH] *** empty log message *** --- WINGs/Makefile.am | 2 +- configure.in | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am index 9bd8c934..5db3ee6e 100644 --- a/WINGs/Makefile.am +++ b/WINGs/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = no-dependencies -SUBDIRS = . Documentation Resources Examples Tests +SUBDIRS = . Documentation Resources Examples Extras Tests diff --git a/configure.in b/configure.in index 0e347160..3358e432 100644 --- a/configure.in +++ b/configure.in @@ -15,7 +15,7 @@ AC_INIT(src/WindowMaker.h) -AM_INIT_AUTOMAKE(WindowMaker, 0.62.2) +AM_INIT_AUTOMAKE(WindowMaker, 0.63.0) AM_PROG_LIBTOOL @@ -174,7 +174,9 @@ dnl ============================================ dnl GCC/as with MMX support dnl -------------------- -if test "$ac_cv_prog_gcc" = yes; then +# until we fix it, leave it disabled +#if test "$ac_cv_prog_gcc" = yes; then +if [ 0 -eq 1 ]; then x86=0 changequote(,)dnl case "$host_cpu" in @@ -183,6 +185,10 @@ if test "$ac_cv_prog_gcc" = yes; then esac changequote([,])dnl + if $host_os != "linux"; then + x86=0 + fi + if test $x86 = 1; then AC_DEFINE(ASM_X86) @@ -851,9 +857,9 @@ dnl AC_SUBST(DOCTYPES) AC_OUTPUT(Makefile po/Makefile util/Makefile test/Makefile wmlib/Makefile \ WINGs/Makefile WINGs/Documentation/Makefile WINGs/Examples/Makefile \ - WINGs/Resources/Makefile WINGs/Tests/Makefile wrlib/Makefile \ - src/Makefile src/wconfig.h doc/Makefile contrib/Makefile \ - WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \ + WINGs/Resources/Makefile WINGs/Tests/Makefile WINGs/Extras/Makefile \ + wrlib/Makefile src/Makefile src/wconfig.h doc/Makefile \ + contrib/Makefile WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \ WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \ WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \ WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \