Commit 1844b47e authored by Michał Kępień's avatar Michał Kępień
Browse files

Merge branch '1970-fix-libtool-initialization' into 'main'

Fix libtool initialization

Closes #1970

See merge request !3742
parents 6f9a87fd a7982d14
Pipeline #45120 passed with stages
in 2 minutes and 57 seconds
...@@ -181,7 +181,6 @@ stages: ...@@ -181,7 +181,6 @@ stages:
--disable-maintainer-mode \ --disable-maintainer-mode \
--enable-developer \ --enable-developer \
--with-libtool \ --with-libtool \
--disable-static \
--with-cmocka \ --with-cmocka \
--with-libxml2 \ --with-libxml2 \
--with-json-c \ --with-json-c \
......
...@@ -110,7 +110,7 @@ AC_PROG_MAKE_SET ...@@ -110,7 +110,7 @@ AC_PROG_MAKE_SET
# Checks for programs. # Checks for programs.
m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # call AM_PROG_AR only if available m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) # call AM_PROG_AR only if available
AC_PROG_LIBTOOL AC_PATH_PROG([LIBTOOL], [libtool])
AS_IF([test -z "$LIBTOOL"], AS_IF([test -z "$LIBTOOL"],
[AC_MSG_ERROR([The libtool script could not be found.])]) [AC_MSG_ERROR([The libtool script could not be found.])])
AC_PROG_INSTALL AC_PROG_INSTALL
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment