Cmake updates:

 * Remove optarg, optind checks which are no longer used
 * Remove CreateHardLink{A,W} checks, since these are probed at runtime
 * Add defines for getgrnam_r getpwnam_r

SVN-Revision: 2362

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8fd0843ea59884e530dec91a614ca231cbe09f4..d9b6ac7c0ed0757d1809769a9966f584fb57b726 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,8 +367,6 @@ ENDIF(LIBXML2_FOUND)
 #
 # Check functions
 #
-CHECK_SYMBOL_EXISTS(CreateHardLinkA "windows.h" HAVE_CREATEHARDLINKA)
-CHECK_SYMBOL_EXISTS(CreateHardLinkW "windows.h" HAVE_CREATEHARDLINKW)
 CHECK_SYMBOL_EXISTS(_CrtSetReportMode "crtdbg.h" HAVE__CrtSetReportMode)
 CHECK_FUNCTION_EXISTS_GLIBC(chflags HAVE_CHFLAGS)
 CHECK_FUNCTION_EXISTS_GLIBC(chown HAVE_CHOWN)
@@ -460,8 +458,6 @@ ENDIF(HAVE_INTTYPES_H)
 CHECK_SYMBOL_EXISTS(EFTYPE           "errno.h"    HAVE_EFTYPE)
 CHECK_SYMBOL_EXISTS(EILSEQ           "errno.h"    HAVE_EILSEQ)
 CHECK_SYMBOL_EXISTS(D_MD_ORDER       "langinfo.h" HAVE_D_MD_ORDER)
-CHECK_SYMBOL_EXISTS(optarg           "unistd.h"   HAVE_DECL_OPTARG)
-CHECK_SYMBOL_EXISTS(optind           "unistd.h"   HAVE_DECL_OPTIND)
 CHECK_SYMBOL_EXISTS(INT64_MAX        "${headers}" HAVE_DECL_INT64_MAX)
 CHECK_SYMBOL_EXISTS(INT64_MIN        "${headers}" HAVE_DECL_INT64_MIN)
 CHECK_SYMBOL_EXISTS(UINT32_MAX       "${headers}" HAVE_DECL_UINT32_MAX)

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index a302b3f3320b8a163eb24c855023b107f85cbfc1..205ca67b79b8c929a9d509bfb01ea41f43444c5c 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -63,12 +63,6 @@
 /* Define to 1 if you have the <copyfile.h> header file. */
 #cmakedefine HAVE_COPYFILE_H 1
 
-/* Define to 1 if you have the `CreateHardLinkA' function. */
-#cmakedefine HAVE_CREATEHARDLINKA 1
-
-/* Define to 1 if you have the `CreateHardLinkW' function. */
-#cmakedefine HAVE_CREATEHARDLINKW 1
-
 /* Define to 1 if you have the `ctime_r' function. */
 #cmakedefine HAVE_CTIME_R 1
 
@@ -86,14 +80,6 @@
    don't. */
 #cmakedefine HAVE_DECL_INT64_MIN 1
 
-/* Define to 1 if you have the declaration of `optarg', and to 0 if you don't.
-   */
-#cmakedefine HAVE_DECL_OPTARG 1
-
-/* Define to 1 if you have the declaration of `optind', and to 0 if you don't.
-   */
-#cmakedefine HAVE_DECL_OPTIND 1
-
 /* Define to 1 if you have the declaration of `SIZE_MAX', and to 0 if you
    don't. */
 #cmakedefine HAVE_DECL_SIZE_MAX 1
@@ -202,6 +188,12 @@
 /* Define to 1 if you have the `geteuid' function. */
 #cmakedefine HAVE_GETEUID 1
 
+/* Define to 1 if you have the `getgrnam_r' function. */
+#cmakedefine HAVE_GETGRNAM_R
+
+/* Define to 1 if you have the `getpwnam_r' function. */
+#cmakedefine HAVE_GETPWNAM_R
+
 /* Define to 1 if you have the `getpid' function. */
 #cmakedefine HAVE_GETPID 1