more autotools updates.

icculus · Apr 15, 2021 · f1f8257 · f1f8257
1 parent aa5d548
commit f1f8257
Show file tree

Hide file tree

Showing 13 changed files with 140 additions and 82 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -41,8 +41,11 @@ DIST_COMMON = README $(am__configure_deps) \
 	$(am__libSDL2_soundinclude_HEADERS_DIST) \
 	$(am__libSDL_soundinclude_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure COPYING INSTALL TODO compile \
-	config.guess config.sub depcomp install-sh ltmain.sh missing
+	$(top_srcdir)/configure COPYING INSTALL TODO \
+	build-scripts/compile build-scripts/config.guess \
+	build-scripts/config.sub build-scripts/depcomp \
+	build-scripts/install-sh build-scripts/ltmain.sh \
+	build-scripts/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude/libtool.m4 \
 	$(top_srcdir)/acinclude/ltoptions.m4 \
@@ -109,7 +112,7 @@ libSDL_sound_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(libSDL_sound_la_LDFLAGS) $(LDFLAGS) -o $@
 @USE_SDL2_FALSE@am_libSDL_sound_la_rpath = -rpath $(libdir)
 DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-scripts/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

diff --git a/compile → build-scripts/compile b/compile → build-scripts/compile
diff --git a/config.guess → build-scripts/config.guess b/config.guess → build-scripts/config.guess
diff --git a/config.sub → build-scripts/config.sub b/config.sub → build-scripts/config.sub
diff --git a/depcomp → build-scripts/depcomp b/depcomp → build-scripts/depcomp
diff --git a/install-sh → build-scripts/install-sh b/install-sh → build-scripts/install-sh
diff --git a/ltmain.sh → build-scripts/ltmain.sh b/ltmain.sh → build-scripts/ltmain.sh
diff --git a/missing → build-scripts/missing b/missing → build-scripts/missing
diff --git a/configure b/configure
@@ -2085,6 +2085,37 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+ac_aux_dir=
+for ac_dir in build-scripts "$srcdir"/build-scripts; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in build-scripts \"$srcdir\"/build-scripts" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in build-scripts \"$srcdir\"/build-scripts" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
 
 
 # Making releases:
@@ -2120,37 +2151,6 @@ LT_AGE=`expr $BINARY_AGE - $INTERFACE_AGE`
 
 
 
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@@ -11615,6 +11615,83 @@ CC="$lt_save_CC"
 
 
 
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug;
+else
+  enable_debug=no
+fi
+
+if test x$enable_debug = xyes; then
+  if test x$ac_cv_prog_cc_g = xyes; then
+    CFLAGS="-g -O0"
+  else
+    CFLAGS="-O0"
+  fi
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define DEBUG_CHATTER 1
+_ACEOF
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define NDEBUG 1
+_ACEOF
+
+fi
+
+
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall"
+{ $as_echo "$as_me:$LINENO: checking if ${CC} supports -Wall" >&5
+$as_echo_n "checking if ${CC} supports -Wall... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+int foo;
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+  CFLAGS="$saved_CFLAGS"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+
 
   CFLAG_VISIBILITY=
   HAVE_VISIBILITY=0
@@ -11756,40 +11833,6 @@ fi
 
 
 
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
-else
-  enable_debug=no
-fi
-
-if test x$enable_debug = xyes; then
-  if test x$ac_cv_prog_cc_g = xyes; then
-    CFLAGS="-g -O0"
-  else
-    CFLAGS="-O0"
-  fi
-  CFLAGS="$CFLAGS -Werror"
-
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define DEBUG_CHATTER 1
-_ACEOF
-
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
-
-fi
-
-
-
 # Check whether --enable-sdl2 was given.
 if test "${enable_sdl2+set}" = set; then
   enableval=$enable_sdl2;

diff --git a/configure.ac b/configure.ac
@@ -2,6 +2,7 @@
 AC_INIT
 AC_CONFIG_SRCDIR([SDL_sound.c])
 AC_CONFIG_MACRO_DIR([acinclude])
+AC_CONFIG_AUX_DIR(build-scripts)
 
 dnl ---------------------------------------------------------------------
 dnl System/version info
@@ -59,16 +60,6 @@ AC_PROG_LN_S
 LT_INIT([win32-dll])
 
 
-dnl ---------------------------------------------------------------------
-dnl Have GCC's -fvisibility option?
-dnl ---------------------------------------------------------------------
-gl_VISIBILITY
-
-if test x$gl_cv_cc_visibility = xyes; then
-    CFLAGS="$CFLAGS -fvisibility=hidden"
-fi
-
-
 dnl ---------------------------------------------------------------------
 dnl Debug mode?
 dnl ---------------------------------------------------------------------
@@ -82,14 +73,35 @@ if test x$enable_debug = xyes; then
   else
     CFLAGS="-O0"
   fi
-  CFLAGS="$CFLAGS -Werror"
   AC_DEFINE(DEBUG, 1, [Define for debug builds.])
   AC_DEFINE(DEBUG_CHATTER, 1, [Define for debug build chattering.])
 else
   AC_DEFINE(NDEBUG, 1, [Define to disable debugging.])
 fi
 
 
+dnl ---------------------------------------------------------------------
+dnl Have GCC's -Wall option?
+dnl ---------------------------------------------------------------------
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wall"
+AC_MSG_CHECKING([if ${CC} supports -Wall])
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int foo;]])],
+  [AC_MSG_RESULT([yes])],
+  [AC_MSG_RESULT([no])
+  CFLAGS="$saved_CFLAGS"])
+
+
+dnl ---------------------------------------------------------------------
+dnl Have GCC's -fvisibility option?
+dnl ---------------------------------------------------------------------
+gl_VISIBILITY
+
+if test x$gl_cv_cc_visibility = xyes; then
+    CFLAGS="$CFLAGS -fvisibility=hidden"
+fi
+
+
 dnl ---------------------------------------------------------------------
 dnl Checks for libraries.
 dnl ---------------------------------------------------------------------

diff --git a/decoders/Makefile.in b/decoders/Makefile.in
@@ -60,7 +60,7 @@ am_libdecoders_la_OBJECTS = aiff.lo au.lo mikmod.lo modplug.lo \
 	quicktime.lo wav.lo
 libdecoders_la_OBJECTS = $(am_libdecoders_la_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-scripts/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

diff --git a/decoders/timidity/Makefile.in b/decoders/timidity/Makefile.in
@@ -61,7 +61,7 @@ am_libtimidity_la_OBJECTS = common.lo instrum.lo mix.lo output.lo \
 libtimidity_la_OBJECTS = $(am_libtimidity_la_OBJECTS)
 @USE_TIMIDITY_TRUE@am_libtimidity_la_rpath =
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-scripts/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \

diff --git a/examples/Makefile.in b/examples/Makefile.in
@@ -63,7 +63,7 @@ am_playsound_simple_OBJECTS = playsound_simple.$(OBJEXT)
 playsound_simple_OBJECTS = $(am_playsound_simple_OBJECTS)
 playsound_simple_DEPENDENCIES = ../$(LIBSDL_SOUND)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-scripts/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \