Restored conditional linking of the i18n libs.

We don't want to link in libintl  and libiconv on all systems. The GNU
C library provides  built-in versions of gettext  and iconv functions,
so these two libraries don't usually exist on systems using glibc.

git-svn-id: https://s.snth.net/svn/neverball/trunk@1282 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/Makefile b/Makefile
index cf9e0a9..cd1fd5b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,24 +51,29 @@ SDL_LIBS := $(shell sdl-config --libs)
 PNG_LIBS := $(shell libpng-config --libs)
 
 ifdef MINGW
+    ifneq ($(ENABLE_NLS),0)
+        INTL_LIBS := -lintl -liconv
+    endif
+
     OGL_LIBS := -lopengl32 -lm
 else ifdef DARWIN
+    ifneq ($(ENABLE_NLS),0)
+        INTL_LIBS := -lintl -liconv
+    endif
+
     OGL_LIBS := -framework OpenGL
 else
     OGL_LIBS := -lGL -lm
 endif
 
-ifneq ($(ENABLE_NLS),0)
-       INTL_LIBS := -lintl -liconv
-endif
-
 BASE_LIBS := -ljpeg $(PNG_LIBS)
 
 ifdef DARWIN
     BASE_LIBS += -L/opt/local/lib
 endif
 
-ALL_LIBS  := $(SDL_LIBS) $(BASE_LIBS) $(INTL_LIBS) -lSDL_ttf -lvorbisfile $(OGL_LIBS)
+ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(INTL_LIBS) -lSDL_ttf \
+    -lvorbisfile $(OGL_LIBS)
 
 #------------------------------------------------------------------------------