Avoid using our getopt.h on systems that have their own

Our version may not be 100 % compatible or at least not 100 % optimal for the given system.
cfengine · Jul 28, 2023 · cc2f364 · cc2f364
1 parent bb683d2
commit cc2f364
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -730,7 +730,7 @@ AC_CHECK_HEADERS(net/if_arp.h, , , [AC_INCLUDES_DEFAULT
 ])
 
 AC_CHECK_HEADERS(getopt.h, [system_getopt_h=1], [system_getopt_h=0])
-AM_CONDITIONAL([SYSTEM_GETOPT_H], [test x$system_getopt_h = x1])
+AM_CONDITIONAL([NO_SYSTEM_GETOPT_H], [test x$system_getopt_h = x0])
 AC_CHECK_HEADERS(utime.h)
 AC_CHECK_HEADERS(time.h)
 AC_CHECK_HEADERS(sys/time.h)

diff --git a/libcfecompat/Makefile.am b/libcfecompat/Makefile.am
@@ -29,10 +29,21 @@ AM_CPPFLAGS = -I$(top_srcdir)/libntech/libutils            # platform.h
 libcfecompat_la_LIBADD = $(LTLIBOBJS)
 
 libcfecompat_la_SOURCES = \
-	unused.c \
+	unused.c
+
+EXTRA_DIST = \
+	cfecompat.h \
+	compat_getopt.h
+
+if NO_SYSTEM_GETOPT_H
+BUILT_SOURCES = getopt.h
+
+getopt.h:
+	cp $(srcdir)/compat_getopt.h $(srcdir)/getopt.h
+
+libcfecompat_la_SOURCES += \
 	getopt.c \
 	getopt1.c
 
-EXTRA_DIST = \
-	getopt.h \
-	cfecompat.h
+nodist_libcfecompat_la_SOURCES = getopt.h
+endif
diff --git a/libcfecompat/getopt.h → libcfecompat/compat_getopt.h b/libcfecompat/getopt.h → libcfecompat/compat_getopt.h