* Don't try to use gettext if we don't have GNU gettext. This may change

    in the future though (most GNU software seems to include a local copy of
    gettext in case the operating system doesn't provide it).

diff --git a/configure b/configure
index 0c912c5320825786f45dcbdd46509c7014fe47e0..3e5fc173024a6fa093b303a7468925f82626a64f 100755 (executable)
--- a/configure
+++ b/configure
@@ -8355,7 +8355,6 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
-#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in])
 
 echo "
 global configuration

diff --git a/configure.in b/configure.in
index dc23f580e2304ee873408bb07de668df5eeacc35..01c7258d092903abb549f56869002a6fd07e6d66 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1292,7 +1292,6 @@ AC_SUBST(OBJ_LIBDVDCSS)
 AC_SUBST(NEED_LIBDVDCSS)
 
 AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in])
-#AC_OUTPUT([Makefile.opts include/config.h intl/Makefile po/Makefile.in])
 
 echo "
 global configuration

diff --git a/include/common.h b/include/common.h
index 0b2ce1c74253650de325501db1e7628b7b3083e6..da0f97e37c2b6873b0911d7c6fe0a0af577760e3 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: common.h,v 1.55 2001/12/10 04:53:10 sam Exp $
+ * $Id: common.h,v 1.56 2001/12/11 23:53:20 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -410,7 +410,7 @@ typedef __int64 off_t;
 /*****************************************************************************
  * I18n stuff
  *****************************************************************************/
-#ifdef ENABLE_NLS
+#if defined( ENABLE_NLS ) && defined ( HAVE_GETTEXT )
 #   include <libintl.h>
 #else
 #   define _(String) (String)