From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Tue, 22 Sep 2020 02:51:49 +0000 (-0700)
Subject: remove build system detection of _NSGetEnviron() and crt_externs.h
X-Git-Tag: 2.46.0~20^2^2~62^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04df2a250078d7cb6991eadab04103731c266363;p=graphviz

remove build system detection of _NSGetEnviron() and crt_externs.h

Neither of these are used any more.
---

diff --git a/cmake/config_checks.cmake b/cmake/config_checks.cmake
index df8fee7d1..aa241caa6 100644
--- a/cmake/config_checks.cmake
+++ b/cmake/config_checks.cmake
@@ -1,7 +1,6 @@
 # Header checks
 include(CheckIncludeFile)
 
-check_include_file( crt_externs.h       HAVE_CRT_EXTERNS_H      )
 check_include_file( fcntl .h            HAVE_FCNTL_H            )
 check_include_file( search.h            HAVE_SEARCH_H           )
 check_include_file( stat.h              HAVE_STAT_H             )
@@ -23,7 +22,6 @@ check_include_file( X11/Xaw/Text.h      HAVE_X11_XAW_TEXT_H     )
 # Function checks
 include(CheckFunctionExists)
 
-check_function_exists( _NSGetEnviron    HAVE__NSGETENVIRON  )
 check_function_exists( drand48          HAVE_DRAND48        )
 check_function_exists( cbrt             HAVE_CBRT           )
 check_function_exists( getpagesize      HAVE_GETPAGESIZE    )
diff --git a/config-cmake.h.in b/config-cmake.h.in
index 3b320e1b0..ff98abbc3 100644
--- a/config-cmake.h.in
+++ b/config-cmake.h.in
@@ -1,5 +1,4 @@
 // Include headers
-#cmakedefine HAVE_CRT_EXTERNS_H
 #cmakedefine HAVE_FCNTL_H
 #cmakedefine HAVE_MALLOC_H
 #cmakedefine HAVE_SEARCH_H
@@ -20,7 +19,6 @@
 #cmakedefine HAVE_X11_XAW_TEXT_H
 
 // Functions
-#cmakedefine HAVE__NSGETENVIRON
 #cmakedefine HAVE_DRAND48
 #cmakedefine HAVE_CBRT
 #cmakedefine HAVE_GETPAGESIZE
diff --git a/configure.ac b/configure.ac
index 9b7768427..f2f02d1f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,7 @@ AC_CHECK_HEADERS( \
 	unistd.h strings.h stat.h vfork.h \
 	sys/time.h sys/types.h sys/select.h sys/socket.h \
 	sys/stat.h sys/mman.h sys/vfork.h \
-	sys/ioctl.h sys/inotify.h crt_externs.h)
+	sys/ioctl.h sys/inotify.h)
 
 # Internationalization macros
 # AM_GNU_GETTEXT
@@ -459,7 +459,7 @@ LIBS=$save_LIBS
 
 # Checks for library functions
 AC_CHECK_FUNCS([lrand48 drand48 srand48 setmode setenv getenv \
-	cbrt vsnprintf _NSGetEnviron mallopt mallinfo mstats getpagesize \
+	cbrt vsnprintf mallopt mallinfo mstats getpagesize \
   ftruncate lseek64 stat64 vfork unlink waitpid select])
 
 AC_REPLACE_FUNCS([strcasestr])
diff --git a/windows/include/config.h b/windows/include/config.h
index ea8a091f6..7051c52d2 100644
--- a/windows/include/config.h
+++ b/windows/include/config.h
@@ -41,9 +41,6 @@
 /* Define to 1 if you have the `cbrt' function. */
 //#define HAVE_CBRT 1
 
-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
 /* Define to 1 if you have the `deflateBound' function. */
 /* #undef HAVE_DEFLATEBOUND */
 
@@ -272,9 +269,6 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #define HAVE__BOOL 1
 
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
 /* Define as const if the declaration of iconv() needs const. */
 #define ICONV_CONST const