diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-14 10:09:19 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-14 10:10:09 +0100 |
| commit | 50c5a4ce9cb7c908e798158edac8001246f6e888 (patch) | |
| tree | 6c8395b73cccd7e370e90073f3c72b2788ccc2d5 /configure.ac | |
| parent | f9903a57dcb478c3b0e3c184ab6a020affff94d6 (diff) | |
Revert "Avoid duplicate symbols in libmerged for Windows too."
Forgot to test properly on Windows :-(.
This reverts commit fc27a685d466dc380a8b68cd48f47db632ed3693.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 7c5d277d7ee1..92ca7dd700ab 100644 --- a/configure.ac +++ b/configure.ac @@ -12424,11 +12424,11 @@ if test -n "$enable_mergelibs" -a "$enable_mergelibs" != "no"; then if test "$enable_mergelibs" = "all"; then MERGELIBS="ALL" URELIBS="TRUE" - AC_DEFINE(STATIC_LINKING) else MERGELIBS="CORE" fi AC_MSG_RESULT([yes]) + AC_DEFINE(STATIC_LINKING) else AC_MSG_RESULT([no]) fi |