tjh.dev
1From 4c5cbf6db71cf2981fc836ed370c82149748d8ea Mon Sep 17 00:00:00 2001
2From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com>
3Date: Wed, 6 Dec 2023 22:57:19 +0000
4Subject: [PATCH] use system getopt
5
6the file compat/getopt.h also needs to be removed otherwise it will
7create conflicts with the system includes
8---
9 compat/Makefile.am | 4 ++--
10 compat/Makefile.in | 6 +++---
11 2 files changed, 5 insertions(+), 5 deletions(-)
12
13diff --git a/compat/Makefile.am b/compat/Makefile.am
14index aefc06f..23aaf81 100644
15--- a/compat/Makefile.am
16+++ b/compat/Makefile.am
17@@ -25,7 +25,7 @@
18 AUTOMAKE_OPTIONS = no-dependencies
19
20 noinst_LIBRARIES = libcompat.a
21-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c
22+libcompat_a_SOURCES = xalloc.c regex.c
23 libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@
24 libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
25
26@@ -34,7 +34,7 @@ libcompat_a_SOURCES_windelta = \
27 +../w32/getpwd.c \
28 +../w32/getuid.c
29
30-noinst_HEADERS = getopt.h regex.h xalloc.h
31+noinst_HEADERS = regex.h xalloc.h
32
33 EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \
34 strtoul.c gettext.h
35diff --git a/compat/Makefile.in b/compat/Makefile.in
36index edfc620..dee05d7 100644
37--- a/compat/Makefile.in
38+++ b/compat/Makefile.in
39@@ -137,7 +137,7 @@ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
40 am__v_AR_0 = @echo " AR " $@;
41 am__v_AR_1 =
42 libcompat_a_AR = $(AR) $(ARFLAGS)
43-am_libcompat_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \
44+am_libcompat_a_OBJECTS = \
45 xalloc.$(OBJEXT) regex.$(OBJEXT)
46 libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS)
47 AM_V_P = $(am__v_P_@AM_V@)
48@@ -326,7 +326,7 @@ top_builddir = @top_builddir@
49 top_srcdir = @top_srcdir@
50 AUTOMAKE_OPTIONS = no-dependencies
51 noinst_LIBRARIES = libcompat.a
52-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c
53+libcompat_a_SOURCES = xalloc.c regex.c
54 libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@
55 libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@
56 libcompat_a_SOURCES_windelta = \
57@@ -334,7 +334,7 @@ libcompat_a_SOURCES_windelta = \
58 +../w32/getpwd.c \
59 +../w32/getuid.c
60
61-noinst_HEADERS = getopt.h regex.h xalloc.h
62+noinst_HEADERS = regex.h xalloc.h
63 EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \
64 strtoul.c gettext.h
65
66--
672.42.0
68