Skip to content

Commit f29f81f

Browse files
committed
[config] remove libgpm refs
1 parent 92bce5a commit f29f81f

File tree

2 files changed

+2
-43
lines changed

2 files changed

+2
-43
lines changed

configure.ac

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,6 @@ AC_SEARCH_LIBS(backtrace, execinfo)
9696
AC_SEARCH_LIBS(uc_width, unistring, [], [AC_MSG_ERROR([libunistring required to build])])
9797
LIBCURL_CHECK_CONFIG([], [7.23.0], [], [AC_MSG_ERROR([libcurl required to build])], [test x"${enable_static}" = x"yes"])
9898

99-
dnl libgpm is required on some systems where there is a misconfigured ncurses
100-
dnl and gpm libraries with interdependencies. This check is not required on OS X.
101-
AS_CASE(["$host_os"],
102-
[darwin*],
103-
[],
104-
AC_SEARCH_LIBS(Gpm_Open, [gpm :libgpm.so.2],
105-
AS_VAR_SET(HAVE_GPM, "1"),
106-
AC_MSG_WARN(m4_join([ ],
107-
[libgpm not found. If build fails later],
108-
[consider installing gpm dev package])dnl
109-
)
110-
)
111-
)
112-
11399
AC_CHECK_HEADERS(execinfo.h pty.h util.h zlib.h bzlib.h libutil.h sys/ttydefaults.h libproc.h uniwidth.h sys/sysctl.h windows.h)
114100

115101
AS_IF([test "x$ac_cv_header_uniwidth_h" != "xyes"], [
@@ -201,7 +187,7 @@ AS_VAR_SET(static_lib_list,
201187
AS_VAR_SET(static_lib_list,
202188
["$static_lib_list libpcre2-8.a libbz2.a"])
203189
AS_VAR_SET(static_lib_list,
204-
["$static_lib_list libgpm.a libcurl.a libcrypto.a libssl.a libssh2.a"])
190+
["$static_lib_list libcurl.a libcrypto.a libssl.a libssh2.a"])
205191
AS_VAR_SET(static_lib_list,
206192
["$static_lib_list libnghttp2.a libexpat.a liblzma.a libcrypto.a libzstd.a libldap.a"])
207193
AS_VAR_SET(static_lib_list,
@@ -258,32 +244,7 @@ AC_SUBST(STATIC_LDFLAGS)
258244
AS_CASE(["$host_os"],
259245
[darwin*],
260246
[LDFLAGS="$LDFLAGS -framework CoreFoundation"],
261-
[
262-
curses_lib=$(echo $CURSES_LIB | sed -e 's/-l//')
263-
AS_IF([test $? -eq 0],
264-
[
265-
AS_CASE(["$curses_lib"],
266-
[ncurses*],
267-
[AS_VAR_SET_IF(HAVE_GPM, [],
268-
[
269-
AC_MSG_NOTICE([Checking for libgpm dependency])
270-
AS_VAR_SET(saved_LDFLAGS, $LDFLAGS)
271-
AS_VAR_SET(LDFLAGS, "$STATIC_LDFLAGS $LDFLAGS")
272-
AS_VAR_SET(saved_LIBS, $LIBS)
273-
AC_CHECK_LIB($curses_lib, mousemask,
274-
[
275-
AS_VAR_SET(LDFLAGS, $saved_LDFLAGS)
276-
AS_VAR_SET(LIBS, $saved_LIBS)
277-
],
278-
AC_MSG_ERROR([libgpm development libraries are required to build]))dnl
279-
])dnl
280-
])
281-
],
282-
[
283-
AC_MSG_WARN([Unable to test for dependepncy on gpm.])
284-
AC_MSG_WARN([If build fails during make consider installing libgpm development libraries.])
285-
])dnl
286-
]dnl
247+
[]
287248
)
288249

289250
saved_location=$(pwd)

snapcraft.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,11 @@ parts:
7373
- libunistring-dev
7474
- zlib1g-dev
7575
- libbz2-dev
76-
- libgpm-dev
7776
stage-packages:
7877
- zlib1g
7978
- git-core
8079
- libcurl4
8180
- libpcre2-8-0
82-
- libgpm2
8381
- libarchive13
8482
- libicu70
8583
- libxml2

0 commit comments

Comments
 (0)