README.rst: reformat the "Links" section

[ncmpc.git] / m4 / glib-gettext.m4

diff --git a/m4/glib-gettext.m4 b/m4/glib-gettext.m4
index 68b08b3f4be5080aea09a6ea4683f97538055361..155b1d83da75901f961637422d18c70f1c9a8a74 100644 (file)
--- a/m4/glib-gettext.m4
+++ b/m4/glib-gettext.m4
@@ -239,6 +239,10 @@ msgstr ""
              [CATOBJEXT=.mo
                DATADIRNAME=lib])
            ;;
              [CATOBJEXT=.mo
                DATADIRNAME=lib])
            ;;

+           *-*-openbsd*)
+           CATOBJEXT=.mo
+            DATADIRNAME=share
+           ;;

            *)
            CATOBJEXT=.mo
             DATADIRNAME=lib
            *)
            CATOBJEXT=.mo
             DATADIRNAME=lib


@@ -280,7 +284,7 @@ msgstr ""
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs
 
     dnl These rules are solely for the distribution goal.  While doing this
     dnl we only have to keep exactly one list of the available catalogs

-    dnl in configure.in.
+    dnl in configure.ac.

     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"
     for lang in $ALL_LINGUAS; do
       GMOFILES="$GMOFILES $lang.gmo"
       POFILES="$POFILES $lang.po"


@@ -309,9 +313,8 @@ msgstr ""
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl

-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],

   [AC_REQUIRE([AC_PROG_CC])dnl
   [AC_REQUIRE([AC_PROG_CC])dnl

-   AC_REQUIRE([AC_HEADER_STDC])dnl

    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS


@@ -380,7 +383,8 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,        $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
        < $srcdir/po/POTFILES.in > po/POTFILES
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,        $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
        < $srcdir/po/POTFILES.in > po/POTFILES

-  ])
+  ],
+  [[$0: This macro is deprecated. You should use upstream gettext instead.]])

 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------


@@ -409,7 +413,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
 dnl
 dnl Now the definitions that aclocal will find
 dnl
 dnl
 dnl Now the definitions that aclocal will find
 dnl

-ifdef(glib_configure_in,[],[
+ifdef(glib_configure_ac,[],[

 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
 AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
 AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl