diff --git a/ChangeLog b/ChangeLog index e1684d99..ba6bc038 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ - Add vt_set_use_conpty(). - pty_open() -> conpty_open() and pipe_open() +2023-11-05 Araki Ken + + * configure.in, gtk/Makefile.in: Add SSH2_LIBS_FOR_VTE. + 2023-11-04 Araki Ken * fb/ui_font.c: Fix compiling error in ui_font_set_dpi_for_fc(). diff --git a/configure b/configure index 0bc30df2..66acc9e3 100755 --- a/configure +++ b/configure @@ -764,6 +764,7 @@ VTE_CFLAGS MOSH_OCB_OBJ MOSH_DIR VT_PTY_OBJ +SSH2_LIBS_FOR_VTE SSH2_LIBS_FOR_PROG PTY_CFLAGS PROTOBUF_LIBS @@ -17518,6 +17519,8 @@ fi + + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDK_PIXBUF" >&5 $as_echo_n "checking for GDK_PIXBUF... " >&6; } @@ -19700,6 +19703,7 @@ if test "$ml_cv_is_posix" = "no" ; then SSH2_LIBS_FOR_PROG="$SSH2_LIBS -lwsock32 -lws2_32" SSH2_LIBS= fi + SSH2_LIBS_FOR_VTE=$SSH2_LIBS_FOR_PROG fi ac_fn_c_check_func "$LINENO" "CreatePseudoConsole" "ac_cv_func_CreatePseudoConsole" @@ -19764,6 +19768,7 @@ fi + if test "${have_gtk}" = "yes" ; then if test "${gtk_version}" = "3.0" ; then diff --git a/configure.in b/configure.in index 34e7befd..f6cf35f5 100644 --- a/configure.in +++ b/configure.in @@ -994,6 +994,7 @@ if test "$ml_cv_is_posix" = "no" ; then SSH2_LIBS_FOR_PROG="$SSH2_LIBS -lwsock32 -lws2_32" SSH2_LIBS= fi + SSH2_LIBS_FOR_VTE=$SSH2_LIBS_FOR_PROG fi AC_CHECK_FUNC(CreatePseudoConsole, @@ -1044,6 +1045,7 @@ else fi AC_SUBST(SSH2_LIBS) AC_SUBST(SSH2_LIBS_FOR_PROG) +AC_SUBST(SSH2_LIBS_FOR_VTE) AC_SUBST(SSH2_CFLAGS) AC_SUBST(VT_PTY_OBJ) AC_SUBST(MOSH_DIR) diff --git a/gtk/Makefile.in b/gtk/Makefile.in index f6ea289a..2dd2bcad 100644 --- a/gtk/Makefile.in +++ b/gtk/Makefile.in @@ -42,7 +42,8 @@ CFLAGS = $(CFLAGS_LOCAL) @POBL_CFLAGS@ @MEF_CFLAGS@ @TYPE_CFLAGS@ @DEB_CFLAGS@ \ -DSYSCONFDIR=\"$(sysconfdir)\" `$(PKG_CONFIG) --cflags $(PKG_NAME)` \ @BRLAPI_CFLAGS@ @CFLAGS@ @CPPFLAGS@ LIBS = $(LPOBL) $(LMEF) @IMAGELIB_LIBS@ @DL_LIBS_IM@ @GTK_LIBS@ \ - @CTL_LIBS_FOR_VTE@ @TYPE_LIBS_FOR_VTE@ @BRLAPI_LIBS@ @REGEX_LIBS@ @DEXPORT@ + @CTL_LIBS_FOR_VTE@ @TYPE_LIBS_FOR_VTE@ @SSH2_LIBS_FOR_VTE@ @BRLAPI_LIBS@ \ + @REGEX_LIBS@ @DEXPORT@ LIBTOOL_CC = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CC) @LDFLAGS@