Skip to content

Commit 7a4ba38

Browse files
committed
build: upgrade libtool macros.
* configure.ac: here. * Makefile.am: Enable dependencies on libtool.
1 parent 835285d commit 7a4ba38

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
ACLOCAL_AMFLAGS = -I build-aux/m4
99

10+
libtool: $(LIBTOOL_DEPS)
11+
$(SHELL) ./config.status libtool
12+
1013
# Sources to build library
1114
LIBSOURCES = jaricom.c jcapimin.c jcapistd.c jcarith.c jccoefct.c jccolor.c \
1215
jcdctmgr.c jchuff.c jcinit.c jcmainct.c jcmarker.c jcmaster.c \

configure.ac

+4-3
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,10 @@ int main() {
269269
AC_DEFINE([DONT_USE_B_MODE],[1],[Don't open files in binary mode.])],
270270
AC_MSG_RESULT(Assuming that it does.))
271271

272-
# Configure libtool
273-
AC_LIBTOOL_WIN32_DLL
274-
AC_PROG_LIBTOOL
272+
# Configure libtool.
273+
LT_PREREQ([2.2.6])
274+
LT_INIT([win32-dll])
275+
AC_SUBST([LIBTOOL_DEPS])
275276

276277
# The name of the library to build (not including the "lib" prefix).
277278
# Defaults to "jpeg", but can be changed to another name to avoid

0 commit comments

Comments
 (0)