From 2cf322ffd8b4cb556afc1367c9e95a67e80068f5 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Fri, 9 Apr 2021 00:28:40 +0300
Subject: [PATCH] whitespace tidy-up in configure.ac and regenerate.
---
Makefile.in | 1 +
aclocal.m4 | 2 +-
configure | 55 +++++++++++++++++++++++++++++++++++++++-------------
configure.ac | 11 +++++------
4 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index cdb6636..57aee41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -384,6 +384,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff --git a/aclocal.m4 b/aclocal.m4
index 3db3af8..4ba010e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -464,7 +464,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(
- m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
[ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
diff --git a/configure b/configure
index 48c05c1..3878a26 100755
--- a/configure
+++ b/configure
@@ -11655,9 +11655,9 @@ done
case "$host" in
*-*-cygwin* | *-*-mingw*)
- ;;
- *)
- ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+ ;;
+
+ *) ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
if test "x$ac_cv_type_size_t" = xyes; then :
else
@@ -11854,7 +11854,7 @@ _ACEOF
fi
- ;;
+ ;;
esac
@@ -13143,7 +13143,7 @@ case "$host" in
*-*-aix*)
if test x$ac_cv_c_compiler_gnu = xyes; then
CFLAGS="-mthreads"
- fi
+ fi
SYS_GL_LIBS=""
;;
*)
@@ -13168,8 +13168,34 @@ else
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
+ac_x_includes=no
+ac_x_libraries=no
+# Do we need to do anything special at all?
+ac_save_LIBS=$LIBS
+LIBS="-lX11 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <X11/Xlib.h>
+int
+main ()
+{
+XrmInitialize ()
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ # We can compile and link X programs with no special options.
+ ac_x_includes=
+ ac_x_libraries=
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS="$ac_save_LIBS"
+# If that didn't work, only try xmkmf and filesystem searches
+# for native compilation.
+if test x"$ac_x_includes" = xno && test "$cross_compiling" = no; then :
+ rm -f -r conftest.dir
if mkdir conftest.dir; then
cd conftest.dir
cat >Imakefile <<'_ACEOF'
@@ -13208,7 +13234,7 @@ _ACEOF
rm -f -r conftest.dir
fi
-# Standard set of common directories for X headers.
+ # Standard set of common directories for X headers.
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13235,6 +13261,8 @@ ac_x_header_dirs='
/usr/local/include/X11R5
/usr/local/include/X11R4
+/opt/X11/include
+
/usr/X386/include
/usr/x386/include
/usr/XFree86/include/X11
@@ -13308,15 +13336,17 @@ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
+fi
+# Record the results.
case $ac_x_includes,$ac_x_libraries in #(
- no,* | *,no | *\'*)
+ no,* | *,no | *\'*) :
# Didn't find X, or a directory has "'" in its name.
- ac_cv_have_x="have_x=no";; #(
- *)
+ ac_cv_have_x="have_x=no" ;; #(
+ *) :
# Record where we found X for the cache.
ac_cv_have_x="have_x=yes\
ac_x_includes='$ac_x_includes'\
- ac_x_libraries='$ac_x_libraries'"
+ ac_x_libraries='$ac_x_libraries'" ;;
esac
fi
;; #(
@@ -13885,7 +13915,6 @@ ac_config_files="$ac_config_files Makefile SDL2_ttf.spec SDL2_ttf.pc"
ac_config_commands="$ac_config_commands summary"
-
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
diff --git a/configure.ac b/configure.ac
index e2ede1e..4cf4fd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,10 +59,10 @@ AC_CHECK_PROGS(WINDRES, [windres $hostaliaswindres $host_os-windres])
case "$host" in
*-*-cygwin* | *-*-mingw*)
- ;;
- *)
- AC_FUNC_ALLOCA
- ;;
+ ;;
+
+ *) AC_FUNC_ALLOCA
+ ;;
esac
@@ -151,7 +151,7 @@ case "$host" in
*-*-aix*)
if test x$ac_cv_c_compiler_gnu = xyes; then
CFLAGS="-mthreads"
- fi
+ fi
SYS_GL_LIBS=""
;;
*)
@@ -197,5 +197,4 @@ SDL2_ttf.pc
])
AC_CONFIG_COMMANDS([summary], [printf "$SUMMARY"], [SUMMARY="$SUMMARY"])
-
AC_OUTPUT