Ticket #1426 (linking with --with-glib-static option)

Makefile.am: change libs search order to fix link problem with --with-glib-static m4.include/mc-with-screen.m4, src/Makefile.am: cleanup
soulik · Aug 2, 2009 · ea4a652 · ea4a652
1 parent d3f1b16
commit ea4a652
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/m4.include/mc-with-screen.m4 b/m4.include/mc-with-screen.m4
@@ -156,7 +156,7 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
         AC_DEFINE(HAVE_SLANG, 1,
             [Define to use S-Lang library for screen management])
 
-        MCLIBS="$MCLIBS $ac_slang_inc_path $ac_slang_lib_path -lslang"
+        MCLIBS="$MCLIBS $ac_slang_lib_path -lslang"
     fi
     CFLAGS="$saved_CFLAGS"
     CPPFLAGS="$saved_CPPFLAGS"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -39,9 +39,9 @@ VFSLIB = ../vfs/libvfs-mc.a
 endif
 endif
 
-mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
-	$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV) search/libsearch.la \
-	mcconfig/libmcconfig.la
+mc_LDADD = $(EDITLIB) $(VFSLIB) \
+	search/libsearch.la mcconfig/libmcconfig.la \
+	$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
 
 CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h