github/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2408 from matt335672/bump_autoconf_ver

Browse Source 
Bump autoconf ver
This commit is contained in:
matt335672
2022-11-11 11:49:41 +00:00
committed by GitHub
parent e37b096951 9b007f1eec
commit d5e5bc0675
4 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+5 -5
View File
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script # Process this file with autoconf to produce a configure script
AC_PREREQ(2.65) AC_PREREQ([2.69])
AC_INIT([xrdp], [0.9.80], [xrdp-devel@googlegroups.com]) AC_INIT([xrdp], [0.9.80], [xrdp-devel@googlegroups.com])
AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in) AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
AM_INIT_AUTOMAKE([1.7.2 foreign]) AM_INIT_AUTOMAKE([1.7.2 foreign])
@@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_C_CONST AC_C_CONST
AC_PROG_LIBTOOL LT_INIT
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
if test "x$PKG_CONFIG" = "x"; then if test "x$PKG_CONFIG" = "x"; then
@@ -82,7 +82,7 @@ fi
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
AC_ARG_ENABLE(tests, AC_ARG_ENABLE(tests,
AC_HELP_STRING([--enable-tests], AS_HELP_STRING([--enable-tests],
[Ensure dependencies for the tests are installed]), [Ensure dependencies for the tests are installed]),
[ensure_tests_deps=yes], []) [ensure_tests_deps=yes], [])
AC_ARG_ENABLE(pam, AS_HELP_STRING([--enable-pam], AC_ARG_ENABLE(pam, AS_HELP_STRING([--enable-pam],
@@ -188,9 +188,9 @@ AC_ARG_ENABLE(rdpsndaudin, AS_HELP_STRING([--enable-rdpsndaudin],
[], [enable_rdpsndaudin=no]) [], [enable_rdpsndaudin=no])
AM_CONDITIONAL(XRDP_RDPSNDAUDIN, [test x$enable_rdpsndaudin = xyes]) AM_CONDITIONAL(XRDP_RDPSNDAUDIN, [test x$enable_rdpsndaudin = xyes])
AC_ARG_WITH(imlib2, AC_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use for non-BMP backgrounds (ARG=yes/no/<abs-path>)]),,) AC_ARG_WITH(imlib2, AS_HELP_STRING([--with-imlib2=ARG], [imlib2 library to use for non-BMP backgrounds (ARG=yes/no/<abs-path>)]),,)
AC_ARG_WITH(freetype2, AC_HELP_STRING([--with-freetype2=ARG], [freetype2 library to use for rendering fonts (ARG=yes/no/<abs-path>)]),,) AC_ARG_WITH(freetype2, AS_HELP_STRING([--with-freetype2=ARG], [freetype2 library to use for rendering fonts (ARG=yes/no/<abs-path>)]),,)
# Obsolete options # Obsolete options
AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug], AC_ARG_ENABLE(xrdpdebug, AS_HELP_STRING([--enable-xrdpdebug],
libpainter
+1 -1
Submodule libpainter updated: 9a1fffa55e...2255b3865e
librfxcodec
+1 -1
Submodule librfxcodec updated: c77afab7ce...30f6ce185c
m4/ax_type_socklen_t.m4
+9 -11
View File
@@ -1,5 +1,5 @@
# =========================================================================== # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_type_socklen_t.html # https://www.gnu.org/software/autoconf-archive/ax_type_socklen_t.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
@@ -27,7 +27,7 @@
# Public License for more details. # Public License for more details.
# #
# You should have received a copy of the GNU General Public License along # You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>. # with this program. If not, see <https://www.gnu.org/licenses/>.
# #
# As a special exception, the respective Autoconf Macro's copyright owner # As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure # gives unlimited permission to copy, distribute and modify the configure
@@ -42,18 +42,16 @@
# modified version of the Autoconf Macro, you may extend this special # modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well. # exception to the GPL to apply to your modified version as well.
#serial 6 #serial 8
AU_ALIAS([TYPE_SOCKLEN_T], [AX_TYPE_SOCKLEN_T]) AU_ALIAS([TYPE_SOCKLEN_T], [AX_TYPE_SOCKLEN_T])
AC_DEFUN([AX_TYPE_SOCKLEN_T], AC_DEFUN([AX_TYPE_SOCKLEN_T],
[AC_CACHE_CHECK([for socklen_t], ac_cv_ax_type_socklen_t, [AC_CACHE_CHECK([for socklen_t], [ac_cv_ax_type_socklen_t],
[ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
AC_TRY_COMPILE( #include <sys/socket.h>]],
[#include <sys/types.h> [[socklen_t len = (socklen_t) 42; return (!len);]])],
#include <sys/socket.h>], [ac_cv_ax_type_socklen_t=yes],
[socklen_t len = (socklen_t) 42; return (!len);], [ac_cv_ax_type_socklen_t=no])
ac_cv_ax_type_socklen_t=yes,
ac_cv_ax_type_socklen_t=no)
]) ])
if test $ac_cv_ax_type_socklen_t != yes; then if test $ac_cv_ax_type_socklen_t != yes; then
AC_DEFINE(socklen_t, int, [Substitute for socklen_t]) AC_DEFINE(socklen_t, int, [Substitute for socklen_t])