examples: use build system to check system's getopt existance.

Author: t-w

CMakeLists.txt

@@ -126,6 +126,10 @@ if ( ${HAVE_CHMOD} )
   add_compile_definitions ( HAVE_CHMOD=1 )
 endif()
 
+check_symbol_exists ( getopt "unistd.h" HAVE_GETOPT )
+if ( ${HAVE_GETOPT} )
+  add_compile_definitions ( HAVE_GETOPT=1 )
+endif()
 
 # Check backtrace
 

configure.ac

@@ -130,6 +130,7 @@ AC_TYPE_UINT8_T
 
 # Check functions
 AC_CHECK_FUNCS(chmod, AC_DEFINE([HAVE_CHMOD], [1]))
+AC_CHECK_FUNCS(getopt, AC_DEFINE([HAVE_GETOPT], [1]))
 AC_CHECK_FUNCS(strnlen, AC_DEFINE([HAVE_STRNLEN], [1]))
 AC_CHECK_FUNCS(strndup, AC_DEFINE([HAVE_STRNDUP], [1]))
 AC_CHECK_FUNCS(mempcpy, AC_DEFINE([HAVE_MEMPCPY], [1]))

examples/CMakeLists.txt

@@ -4,16 +4,20 @@ include_directories (
   ${PROJECT_BINARY_DIR}/src
 )
 
+#check_symbol_exists ( chmod "unistd.h" HAVE_GETOPT )
 
-if ( "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" )
+#if ( "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" )
+if ( ${HAVE_GETOPT} )
+  set ( ADFLIB_CUSTOM_GETOPT_SRC "")
+  message ( STATUS "Using system's getopt implementation." )
+else()
   set ( ADFLIB_CUSTOM_GETOPT_SRC
     getopt.c
     getopt.h )
-else()
-  set ( ADFLIB_CUSTOM_GETOPT_SRC "")
+  message ( STATUS "Using custom getopt implementation." )
+  #message ( STATUS "ADFLIB_CUSTOM_GETOPT_SRC: ${ADFLIB_CUSTOM_GETOPT_SRC}" )
 endif()
 
-
 add_executable ( adfbitmap adfbitmap.c )
 target_link_libraries ( adfbitmap adf )
 set_target_properties ( adfbitmap PROPERTIES

examples/adfformat.c

@@ -26,10 +26,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef HAVE_GETOPT
+#include "getopt.h"      // use custom getopt
+#endif
 
-#ifdef WIN32
-#include "getopt.h"
-#else
+#ifndef WIN32
 #include <libgen.h>
 #include <unistd.h>
 #endif

examples/adfimgcreate.c

@@ -25,9 +25,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#ifdef WIN32
-#include "getopt.h"
-#else
+#ifndef HAVE_GETOPT
+#include "getopt.h"      // use custom getopt
+#endif
+
+#ifndef WIN32
 //#include <libgen.h>
 #include <unistd.h>
 #endif

examples/adfsalvage.c

@@ -26,9 +26,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef WIN32
-#include "getopt.h"
-#else
+#ifndef HAVE_GETOPT
+#include "getopt.h"      // use custom getopt
+#endif
+
+#ifndef WIN32
 #include <libgen.h>
 #include <unistd.h>
 #endif