more fixes
This commit is contained in:
parent
d30ae64ab4
commit
6ea1f980ca
@ -1,6 +1,6 @@
|
||||
diff -up torque/acinclude.m4.cleanup torque/acinclude.m4
|
||||
--- torque/acinclude.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/acinclude.m4 2021-04-13 14:01:45.373608719 -0400
|
||||
+++ torque/acinclude.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -20,12 +20,14 @@ dnl
|
||||
AC_DEFUN([AC_DECL_H_ERRNO],
|
||||
[AC_CACHE_CHECK([for h_errno declaration in netdb.h],
|
||||
@ -29,7 +29,7 @@ diff -up torque/acinclude.m4.cleanup torque/acinclude.m4
|
||||
#include <sys/stat.h>
|
||||
diff -up torque/buildutils/ac_c_bigendian_cross.m4.cleanup torque/buildutils/ac_c_bigendian_cross.m4
|
||||
--- torque/buildutils/ac_c_bigendian_cross.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/ac_c_bigendian_cross.m4 2021-04-13 14:01:45.373608719 -0400
|
||||
+++ torque/buildutils/ac_c_bigendian_cross.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -19,18 +19,18 @@ AC_DEFUN([AC_C_BIGENDIAN_CROSS],
|
||||
[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian,
|
||||
[ac_cv_c_bigendian=unknown
|
||||
@ -88,7 +88,7 @@ diff -up torque/buildutils/ac_c_bigendian_cross.m4.cleanup torque/buildutils/ac_
|
||||
AC_MSG_RESULT($ac_cv_c_bigendian)
|
||||
diff -up torque/buildutils/acx_pthread.m4.cleanup torque/buildutils/acx_pthread.m4
|
||||
--- torque/buildutils/acx_pthread.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/acx_pthread.m4 2021-04-13 14:01:45.373608719 -0400
|
||||
+++ torque/buildutils/acx_pthread.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -56,7 +56,7 @@ dnl @license GPLWithACException
|
||||
AC_DEFUN([ACX_PTHREAD], [
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
@ -100,7 +100,7 @@ diff -up torque/buildutils/acx_pthread.m4.cleanup torque/buildutils/acx_pthread.
|
||||
# We used to check for pthread.h first, but this fails if pthread.h
|
||||
diff -up torque/buildutils/ax_cflags_gcc_option.m4.cleanup torque/buildutils/ax_cflags_gcc_option.m4
|
||||
--- torque/buildutils/ax_cflags_gcc_option.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/ax_cflags_gcc_option.m4 2021-04-13 14:01:45.374608727 -0400
|
||||
+++ torque/buildutils/ax_cflags_gcc_option.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -87,15 +87,14 @@ AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_gcc_o
|
||||
AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for gcc m4_ifval($2,$2,-option)],
|
||||
VAR,[VAR="no, unknown"
|
||||
@ -175,7 +175,7 @@ diff -up torque/buildutils/ax_cflags_gcc_option.m4.cleanup torque/buildutils/ax_
|
||||
AC_LANG_RESTORE
|
||||
diff -up torque/buildutils/tac_tcltk.m4.cleanup torque/buildutils/tac_tcltk.m4
|
||||
--- torque/buildutils/tac_tcltk.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/tac_tcltk.m4 2021-04-13 14:01:45.374608727 -0400
|
||||
+++ torque/buildutils/tac_tcltk.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -215,7 +215,7 @@ fi
|
||||
|
||||
|
||||
@ -187,7 +187,7 @@ diff -up torque/buildutils/tac_tcltk.m4.cleanup torque/buildutils/tac_tcltk.m4
|
||||
if test "$TCL" = "1" ; then
|
||||
diff -up torque/buildutils/tcl.m4.cleanup torque/buildutils/tcl.m4
|
||||
--- torque/buildutils/tcl.m4.cleanup 2021-01-28 16:14:17.000000000 -0500
|
||||
+++ torque/buildutils/tcl.m4 2021-04-13 14:01:45.374608727 -0400
|
||||
+++ torque/buildutils/tcl.m4 2021-04-13 14:14:09.320271814 -0400
|
||||
@@ -44,7 +44,7 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
|
||||
if test x"${no_tcl}" = x ; then
|
||||
# we reset no_tcl in case something fails here
|
||||
@ -435,8 +435,8 @@ diff -up torque/buildutils/tcl.m4.cleanup torque/buildutils/tcl.m4
|
||||
AC_CACHE_VAL(ac_cv_c_$1config,[
|
||||
|
||||
diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
--- torque/configure.ac.cleanup 2021-04-13 14:01:45.366608666 -0400
|
||||
+++ torque/configure.ac 2021-04-13 14:06:01.926561790 -0400
|
||||
--- torque/configure.ac.cleanup 2021-04-13 14:14:09.313271761 -0400
|
||||
+++ torque/configure.ac 2021-04-13 14:36:29.125464515 -0400
|
||||
@@ -32,14 +32,15 @@ dnl Updated to use m4
|
||||
dnl added library functionality to testing
|
||||
dnl by John Rosenquist (jrosenquist@adaptivecomputing.com)
|
||||
@ -524,24 +524,15 @@ diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
|
||||
|
||||
dnl ###########################################
|
||||
@@ -857,7 +860,15 @@ dnl Check for headers
|
||||
dnl
|
||||
@@ -858,6 +861,7 @@ dnl
|
||||
|
||||
AC_HEADER_DIRENT
|
||||
-AC_HEADER_STDC
|
||||
+m4_warn([obsolete],
|
||||
+[The preprocessor macro `STDC_HEADERS' is obsolete.
|
||||
+ Except in unusual embedded environments, you can safely include all
|
||||
+ ISO C90 headers unconditionally.])dnl
|
||||
+# Autoupdate added the next two lines to ensure that your configure
|
||||
+# script's behavior did not change. They are probably safe to remove.
|
||||
+AC_CHECK_INCLUDES_DEFAULT
|
||||
+AC_PROG_EGREP
|
||||
AC_HEADER_STDC
|
||||
+
|
||||
AC_HEADER_SYS_WAIT
|
||||
|
||||
AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h limits.h malloc.h netdb.h \
|
||||
@@ -1368,8 +1379,7 @@ dnl Add the ability to link against the
|
||||
@@ -1368,8 +1372,7 @@ dnl Add the ability to link against the
|
||||
dnl
|
||||
dnl --with-pmix
|
||||
AC_ARG_WITH([pmix],
|
||||
@ -551,7 +542,7 @@ diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
|
||||
AC_MSG_CHECKING([if user requested PMIx support($with_pmix)])
|
||||
AS_IF([test -z "$with_pmix" || test "$with_pmix" = "no"],
|
||||
@@ -2421,7 +2431,7 @@ dnl modulefiles
|
||||
@@ -2421,7 +2424,7 @@ dnl modulefiles
|
||||
AC_MSG_CHECKING([whether to install modulefiles])
|
||||
|
||||
AC_ARG_WITH(modulefiles,
|
||||
@ -560,7 +551,7 @@ diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
[], [with_modulefiles="no"])
|
||||
if test "$with_modulefiles" != 'no'; then
|
||||
if test "$with_modulefiles" = 'yes'; then
|
||||
@@ -2530,7 +2540,7 @@ fi
|
||||
@@ -2530,7 +2533,7 @@ fi
|
||||
AC_CHECK_FUNC(ntohl, [ :],
|
||||
AC_MSG_CHECKING([for ntohl in arpa/inet.h])
|
||||
torque_cv_ntohl_needs_arpa_inet_h="no"
|
||||
@ -569,7 +560,7 @@ diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
@@ -2540,9 +2550,8 @@ AC_CHECK_FUNC(ntohl, [ :],
|
||||
@@ -2540,9 +2543,8 @@ AC_CHECK_FUNC(ntohl, [ :],
|
||||
#ifdef HAVE_ARPA_INET_H
|
||||
#include <arpa/inet.h>
|
||||
#endif
|
||||
@ -581,7 +572,7 @@ diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
AC_MSG_RESULT($torque_cv_ntohl_needs_arpa_inet_h)
|
||||
)
|
||||
|
||||
@@ -2672,7 +2681,7 @@ AC_DEFINE_UNQUOTED([PBS_CFLAGS],"${CFLAG
|
||||
@@ -2672,7 +2674,7 @@ AC_DEFINE_UNQUOTED([PBS_CFLAGS],"${CFLAG
|
||||
|
||||
AC_CONFIG_FILES([torque.spec:buildutils/torque.spec.in])
|
||||
#The output files are alphabetically ordered by src then check test files
|
||||
@ -590,7 +581,7 @@ diff -up torque/configure.ac.cleanup torque/configure.ac
|
||||
buildutils/self-extract-head-sh
|
||||
buildutils/modulefiles
|
||||
buildutils/modulefiles.vers
|
||||
@@ -2727,7 +2736,8 @@ AC_OUTPUT(buildutils/pbs_mkdirs
|
||||
@@ -2727,7 +2729,8 @@ AC_OUTPUT(buildutils/pbs_mkdirs
|
||||
src/drmaa/Doxyfile
|
||||
src/pam/Makefile
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user