From 130ae6da8ee3dcbfdabcd41aea50d89e27823516 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 8 Aug 2019 09:58:22 -0300 Subject: [PATCH] Working on windows build with static lib3270. --- configure.ac | 2 +- server/Makefile.in | 21 ++++++--------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index adc6c27..6f1fdf8 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,7 @@ dnl --------------------------------------------------------------------------- dnl Check for LIBV3270 dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES( [V3270], [libv3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.])) +PKG_CHECK_MODULES( [V3270], [libv3270 lib3270], AC_DEFINE(HAVE_V3270), AC_MSG_ERROR([V3270 not present.])) AC_SUBST(V3270_LIBS) AC_SUBST(V3270_CFLAGS) diff --git a/server/Makefile.in b/server/Makefile.in index 7a4fe25..4acf718 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -102,15 +102,13 @@ CFLAGS= \ @GTK_CFLAGS@ \ @GLIB_CFLAGS@ -GTK_LIBS=@GTK_LIBS@ -V3270_LIBS=@V3270_LIBS@ -GLIB_LIBS=@GLIB_LIBS@ - LIBS= \ @LIBS@ \ @LIBICONV@ \ @INTL_LIBS@ \ - @LIB3270_LIBS@ + @V3270_LIBS@ \ + @GTK_LIBS@ \ + @GLIB_LIBS@ #---[ Debug Rules ]---------------------------------------------------------------------- @@ -201,9 +199,7 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ $(LDFLAGS) \ $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJRLS)/$(SRC).o) \ -L$(BINRLS) -l$(MODULE_NAME) \ - $(V3270_LIBS) \ - $(LIBS) \ - $(GTK_LIBS) + $(LIBS) $(BINRLS)/lib$(MODULE_NAME).a: \ $(foreach SRC, $(basename $(CORE_SOURCES)), $(OBJRLS)/$(SRC).o) @@ -267,10 +263,7 @@ $(BINDBG)/$(MODULE_NAME)@EXEEXT@: \ -L$(BINDBG) \ -Wl,-rpath,$(BINDBG) \ $(LDFLAGS) \ - $(LIBS) \ - $(V3270_LIBS) \ - $(GTK_LIBS) \ - $(GLIB_LIBS) + $(LIBS) $(BINDBG)/$(SERVICE_NAME)@EXEEXT@: \ $(foreach SRC, $(basename $(SERVICE_SOURCES)), $(OBJDBG)/$(SRC).o) \ @@ -300,9 +293,7 @@ $(BINDBG)/$(MODULE_NAME)@DLLEXT@: \ $(LDFLAGS) \ $(foreach SRC, $(basename $(PLUGIN_SOURCES)), $(OBJDBG)/$(SRC).o) \ -L$(BINDBG) -l$(MODULE_NAME) \ - $(V3270_LIBS) \ - $(LIBS) \ - $(GTK_LIBS) + $(LIBS) run: \ -- libgit2 0.21.2