From b00eeac09959dc23885a0ab5025fbd14d060a9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florent=20Thi=C3=A9ry?= Date: Thu, 19 Feb 2015 13:36:40 +0100 Subject: [PATCH] rename STATIC_LIBS by LINK_STATICALLY because it was misleading --- ac/static.m4 | 6 +++--- build-config.in | 2 +- rake.d/target.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ac/static.m4 b/ac/static.m4 index 72156834f..3795bdf01 100644 --- a/ac/static.m4 +++ b/ac/static.m4 @@ -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) diff --git a/build-config.in b/build-config.in index a1ae9e5ec..533e421db 100644 --- a/build-config.in +++ b/build-config.in @@ -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@ diff --git a/rake.d/target.rb b/rake.d/target.rb index 0ebfa911e..5d456eab5 100644 --- a/rake.d/target.rb +++ b/rake.d/target.rb @@ -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' ]