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
Этот коммит содержится в:
родитель
d3f1b16bcf
Коммит
ea4a652275
@ -156,7 +156,7 @@ AC_DEFUN([MC_CHECK_SLANG_BY_PATH], [
|
|||||||
AC_DEFINE(HAVE_SLANG, 1,
|
AC_DEFINE(HAVE_SLANG, 1,
|
||||||
[Define to use S-Lang library for screen management])
|
[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
|
fi
|
||||||
CFLAGS="$saved_CFLAGS"
|
CFLAGS="$saved_CFLAGS"
|
||||||
CPPFLAGS="$saved_CPPFLAGS"
|
CPPFLAGS="$saved_CPPFLAGS"
|
||||||
|
@ -39,9 +39,9 @@ VFSLIB = ../vfs/libvfs-mc.a
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
mc_LDADD = $(EDITLIB) $(SLANGLIB) $(VFSLIB) \
|
mc_LDADD = $(EDITLIB) $(VFSLIB) \
|
||||||
$(INTLLIBS) $(GLIB_LIBS) $(MCLIBS) $(LIBICONV) search/libsearch.la \
|
search/libsearch.la mcconfig/libmcconfig.la \
|
||||||
mcconfig/libmcconfig.la
|
$(INTLLIBS) $(MCLIBS) $(SLANGLIB) $(LIBICONV) $(GLIB_LIBS)
|
||||||
|
|
||||||
CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
|
CHARSET_SRC = charsets.c charsets.h selcodepage.c selcodepage.h
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user