blob: c586696cc512ee58a31888e203297cd99cbc9c5f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
remove old bundled getopt and use glibc/musl instead
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST = utf8.h getopt.h i18n.h base64.h picture.h
+EXTRA_DIST = utf8.h i18n.h base64.h picture.h
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -2,12 +2,10 @@
AM_CPPFLAGS = -I$(top_srcdir)/include
-noinst_LIBRARIES = libutf8.a libgetopt.a libbase64.a libpicture.a
+noinst_LIBRARIES = libutf8.a libbase64.a libpicture.a
libutf8_a_SOURCES = charset.c charset.h iconvert.c utf8.c
-libgetopt_a_SOURCES = getopt.c getopt1.c
-
libbase64_a_SOURCES = base64.c
libpicture_a_SOURCES = picture.c
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,7 @@ fi
AM_CONDITIONAL(HAVE_LIBOPUSFILE, test "x$HAVE_LIBOPUSFILE" = "xyes")
-SHARE_LIBS='$(top_builddir)/share/libutf8.a $(top_builddir)/share/libgetopt.a'
+SHARE_LIBS='$(top_builddir)/share/libutf8.a'
SHARE_CFLAGS='-I$(top_srcdir)/include'
I18N_CFLAGS='-I$(top_srcdir)/intl'
|
