From 372e2bb66ccbfc2ca2280baa4e81e6eda21f24a2 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 16 Jun 2022 22:19:03 -0700
Subject: [PATCH] Added CMake support files to the distribution archive and
sorted the dist files
---
Makefile.am | 26 ++++++++++++++++++++------
Makefile.in | 26 ++++++++++++++++++++------
configure | 16 ++++++++--------
3 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ff9e0b9..d1d43ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -140,12 +140,26 @@ pkgconfig_DATA = SDL2_ttf.pc
.rc.o:
$(RC) $< $@
-EXTRA_DIST = CHANGES.txt LICENSE.txt README.txt \
- Android.mk CMakeLists.txt Makefile.os2 version.rc \
- VisualC VisualC-WinRT Xcode external \
- SDL2_ttf.spec SDL2_ttf.spec.in \
- SDL2_ttfConfig.cmake.in \
- autogen.sh
+EXTRA_DIST = \
+ Android.mk \
+ CHANGES.txt \
+ CMakeLists.txt \
+ LICENSE.txt \
+ Makefile.os2 \
+ README.txt \
+ SDL2_ttf.pc.in \
+ SDL2_ttf.spec.in \
+ SDL2_ttfConfig.cmake.in \
+ VisualC \
+ VisualC-WinRT \
+ Xcode \
+ autogen.sh \
+ cmake \
+ external \
+ mingw \
+ sdl2_ttf-config-version.cmake.in \
+ sdl2_ttf-config.cmake.in \
+ version.rc
noinst_PROGRAMS = showfont glfont
diff --git a/Makefile.in b/Makefile.in
index 6b73e76..602e4a5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -820,12 +820,26 @@ libSDL2_ttf_la_LINK = $(LINKER) $(libSDL2_ttf_la_LDFLAGS)
libSDL2_ttf_la_LIBADD = $(TTF_LIBS) @MATHLIB@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = SDL2_ttf.pc
-EXTRA_DIST = CHANGES.txt LICENSE.txt README.txt \
- Android.mk CMakeLists.txt Makefile.os2 version.rc \
- VisualC VisualC-WinRT Xcode external \
- SDL2_ttf.spec SDL2_ttf.spec.in \
- SDL2_ttfConfig.cmake.in \
- autogen.sh
+EXTRA_DIST = \
+ Android.mk \
+ CHANGES.txt \
+ CMakeLists.txt \
+ LICENSE.txt \
+ Makefile.os2 \
+ README.txt \
+ SDL2_ttf.pc.in \
+ SDL2_ttf.spec.in \
+ SDL2_ttfConfig.cmake.in \
+ VisualC \
+ VisualC-WinRT \
+ Xcode \
+ autogen.sh \
+ cmake \
+ external \
+ mingw \
+ sdl2_ttf-config-version.cmake.in \
+ sdl2_ttf-config.cmake.in \
+ version.rc
showfont_LDADD = libSDL2_ttf.la
glfont_LDADD = libSDL2_ttf.la @GL_LIBS@ @MATHLIB@
diff --git a/configure b/configure
index 291f88f..40efcbd 100755
--- a/configure
+++ b/configure
@@ -13413,11 +13413,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx11=no
+ ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13459,11 +13459,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx98=no
+ ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13783,11 +13783,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
+if test ${ac_cv_prog_cxx_11+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx11=no
+ ac_cv_prog_cxx_11=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -13829,11 +13829,11 @@ if test x$ac_prog_cxx_stdcxx = xno
then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
+if test ${ac_cv_prog_cxx_98+y}
then :
printf %s "(cached) " >&6
else $as_nop
- ac_cv_prog_cxx_cxx98=no
+ ac_cv_prog_cxx_98=no
ac_save_CXX=$CXX
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */