rename STATIC_LIBS by LINK_STATICALLY because it was misleading

This commit is contained in:
Florent Thiéry 2015-02-19 13:36:40 +01:00
parent a77e1e3677
commit b00eeac099
3 changed files with 5 additions and 5 deletions

View File

@ -4,13 +4,13 @@ dnl
AC_ARG_ENABLE([static], AC_HELP_STRING([--enable-static],[make a static build of the applications (no)]), [], [enable_static=no])
STATIC_LIBS=""
LINK_STATICALLY=""
if test x"$enable_static" = xyes ; then
STATIC_LIBS=" -lpthread -static "
LINK_STATICALLY=" -lpthread -static "
opt_features_yes="$opt_features_yes\n * make a static build of the applications"
else
opt_features_no="$opt_features_no\n * make a static build of the applications"
fi
AC_SUBST(STATIC_LIBS)
AC_SUBST(LINK_STATICALLY)

View File

@ -91,7 +91,7 @@ MINGW_LIBS = @MINGW_LIBS@
MINGW_PROCESSOR_ARCH = @MINGW_PROCESSOR_ARCH@
MINGW = @MINGW@
OGG_LIBS = @OGG_LIBS@
STATIC_LIBS=@STATIC_LIBS@
LINK_STATICALLY=@LINK_STATICALLY@
OPTIMIZATION_CFLAGS = @OPTIMIZATION_CFLAGS@
PO4A = @PO4A@
PO4A_TRANSLATE = @PO4A_TRANSLATE@

View File

@ -145,7 +145,7 @@ class Target
when :boost_system then c(:BOOST_SYSTEM_LIB)
when :qt then qt_libraries
when :wxwidgets then c(:WXWIDGETS_LIBS)
when :static then c(:STATIC_LIBS)
when :static then c(:LINK_STATICALLY)
when :mpegparser then [ '-Lsrc/mpegparser', '-lmpegparser' ]
when :mtxinput then [ '-Lsrc/input', '-lmtxinput' ]
when :mtxoutput then [ '-Lsrc/output', '-lmtxoutput' ]