[MPlayer-dev-eng] [PATCH] gettext library detection

[Alexander Gottwald]

Hi,

after upgrading to a newer libintl, mplayer did not compile with i18n support
enabled. The patch add a library detection to configure and the usage of the
detected libraries in Makefile.

Tech:
the gettext functions were in libc before. The newer version of libintl
I compiled for my system now replaces them in libintl.a but mplayer expects
the gettext function to be present in libc.


NP: Devision - God Is Blind
-- 
 Alexander.Gottwald at informatik.tu-chemnitz.de 
 http://www.gotti.org           ICQ: 126018723
-------------- next part --------------
--- ../../SOURCES/MPlayer-cvs/configure	Thu Feb  6 17:45:41 2003
+++ configure	Thu Feb  6 23:14:57 2003
@@ -1555,13 +1555,16 @@
 # Checking for localization ...
 # CSAK EGY MARADHAT - A HEGYLAKO
 echocheck "i18n"
-if test "$_i18n" = auto ; then
-  cat > $TMPC <<EOF
+if test "$_i18n" != no ; then
+  _i18n=no
+  _i18n_libs=""
+  for i18n_lib in "" "-lintl"; do
+    cat > $TMPC <<EOF
 #include <libintl.h>
 int main(void) { gettext("test"); return 0; }
 EOF
-  _i18n=no
-  cc_check && _i18n=yes
+    cc_check $i18n_lib && _i18n=yes && _i18n_libs=$i18n_lib && break
+  done
 fi
 if test "$_i18n" = yes ; then
   _def_i18n='#define USE_I18N 1'
@@ -1569,7 +1572,11 @@
 else
   _def_i18n='#undef USE_I18N'
 fi
-echores "$_i18n"
+if test x$_i18n_libs = x; then
+  echores "$_i18n"
+else
+  echores "$_i18n (using $_i18n_libs)"
+fi
 
 
 # Checking for setlocale() ...
@@ -4785,6 +4792,7 @@
 SHARED_PP = $_shared_pp
 CONFIG_RISKY = yes
 LIBMENU = $_menu
+I18NLIBS = $_i18n_libs
 
 OPENDIVX = $_opendivx
 
--- ../../SOURCES/MPlayer-cvs/Makefile	Thu Feb  6 17:45:41 2003
+++ Makefile	Thu Feb  6 23:24:09 2003
@@ -208,7 +208,7 @@
 
 $(PRG):	$(MPLAYER_DEP)
 	./darwinfixlib.sh $(MPLAYER_DEP)
-	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(STATIC_LIB) $(ARCH_LIB) -lm
+	$(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) libvo/libvo.a libao2/libao2.a $(MENU_LIBS) $(VIDIX_LIBS) $(GUI_LIBS) $(COMMON_LIBS) $(GTK_LIBS) $(VO_LIBS) $(AO_LIBS) $(EXTRA_LIB) $(LIRC_LIB) $(STATIC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm
 
 mplayer.exe.spec.c: libmpcodecs/libmpcodecs.a
 	winebuild -fPIC -o mplayer.exe.spec.c -exe mplayer.exe -mcui \
@@ -228,7 +228,7 @@
 ifeq ($(MENCODER),yes)
 $(PRG_MENCODER): $(MENCODER_DEP)
 	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) -lm 
+	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(COMMON_LIBS) $(EXTRA_LIB) $(ENCORE_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
 endif
 
 codecs.conf.h: $(PRG_CFG)
@@ -245,7 +245,7 @@
 $(MENCODER_DEP): version.h
 
 $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
-	$(CC) $(CFLAGS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML
+	$(CC) $(CFLAGS) $(I18NLIBS) -g codec-cfg.c mp_msg.c -o $(PRG_CFG) -DCODECS2HTML
 
 install: $(ALL_PRG)
 ifeq ($(VIDIX),yes)