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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From: orbea <orbea@riseup.net>
Date: Thu, 14 Jul 2022 13:18:26 -0700
Subject: [PATCH] build: Add a minimal configures script
When building libvterm with slibtool using the rlibtool symlink the
build will fail when the generated libtool is not found. This file is
required with rlibtool so that the build can determine if the build
should be shared, static or both.
This can be solved by adding a minimal configure script.
The build steps are now:
autoreconf -fi
./configure
make
make install
diff --git a/Makefile b/Makefile.in
similarity index 90%
rename from Makefile
rename to Makefile.in
index e3c1c39..70e7ca2 100644
--- a/Makefile
+++ b/Makefile.in
@@ -1,13 +1,13 @@
-ifeq ($(shell uname),Darwin)
- LIBTOOL ?= glibtool
-else
- LIBTOOL ?= libtool
-endif
+top_builddir = @top_builddir@
+
+LIBTOOL = @LIBTOOL@
ifneq ($(VERBOSE),1)
LIBTOOL +=--quiet
endif
+CC = @CC@
+
override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
ifeq ($(shell uname),SunOS)
@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
-VERSION_MAJOR=0
-VERSION_MINOR=2
+VERSION_MAJOR=@VERSION_MAJOR@
+VERSION_MINOR=@VERSION_MINOR@
VERSION_CURRENT=0
VERSION_REVISION=0
VERSION_AGE=0
-VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
+VERSION=@PACKAGE_VERSION@
-PREFIX=/usr/local
-BINDIR=$(PREFIX)/bin
-LIBDIR=$(PREFIX)/lib
-INCDIR=$(PREFIX)/include
-MANDIR=$(PREFIX)/share/man
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+BINDIR=@bindir@
+LIBDIR=@libdir@
+INCDIR=@includedir@
+MANDIR=@mandir@
MAN3DIR=$(MANDIR)/man3
all: $(LIBRARY) $(BINFILES)
@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES)
bin/%: bin/%.c $(LIBRARY)
@echo CC $<
- @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
+ @$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
t/harness.lo: t/harness.c $(HFILES)
@echo CC $<
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..39f7767
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,14 @@
+m4_define([version_major], [0])
+m4_define([version_minor], [2])
+
+AC_INIT([libvterm], [version_major.version_minor])
+AC_CONFIG_FILES([Makefile])
+
+LT_INIT
+
+AC_SUBST([top_builddir], [$abs_builddir])
+
+AC_SUBST([VERSION_MAJOR], [version_major])
+AC_SUBST([VERSION_MINOR], [version_minor])
+
+AC_OUTPUT
|
