[PATCH 1/2] BUILD: update glib-gettext.m4 to latest version from glib git repo

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] BUILD: update glib-gettext.m4 to latest version from glib git repo

Stefan Westerfeld
This fixes autogen.sh issues on KUbuntu 16.04.
---
 autotools/glib-gettext.m4 | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/autotools/glib-gettext.m4 b/autotools/glib-gettext.m4
index 981ba77..155b1d8 100644
--- a/autotools/glib-gettext.m4
+++ b/autotools/glib-gettext.m4
@@ -239,6 +239,10 @@ msgstr ""
       [CATOBJEXT=.mo
                DATADIRNAME=lib])
     ;;
+    *-*-openbsd*)
+    CATOBJEXT=.mo
+            DATADIRNAME=share
+    ;;
     *)
     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 in configure.in.
+    dnl in configure.ac.
     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
-glib_DEFUN([GLIB_GNU_GETTEXT],
+AU_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
   
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -378,10 +381,10 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
      posrcprefix="../"
    fi
    rm -f po/POTFILES
-   test -e $srcdir/po/POTFILES.in && \
-     sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+   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)
 # -------------------------------
@@ -410,7 +413,7 @@ AC_DEFINE_UNQUOTED($1, "$localedir",
 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
--
2.7.4

_______________________________________________
beast mailing list
[hidden email]
https://mail.gnome.org/mailman/listinfo/beast
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] BEAST: link beast against python libraries, fixes build on KUbuntu 16.04

Stefan Westerfeld
---
 beast-gtk/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beast-gtk/Makefile.am b/beast-gtk/Makefile.am
index dfc8651..686a488 100644
--- a/beast-gtk/Makefile.am
+++ b/beast-gtk/Makefile.am
@@ -140,7 +140,7 @@ beast_@MAJOR@_@MINOR@_@MICRO@_SOURCES = $(bst_cc_sources) bstmain.cc
 beast_@MAJOR@_@MINOR@_@MICRO@_LDADD = $(progs_LDADD)
 beast_build_objects = $(beast_@MAJOR@_@MINOR@_@MICRO@_OBJECTS) # dependency for generated sources
 noinst_PROGRAMS = $(ALLTESTS)
-progs_LDADD     = $(BEAST_LIBS) ./gxk/libgxk.a $(GXK_LIBS) $(top_builddir)/bse/libbse-@MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS)
+progs_LDADD     = $(BEAST_LIBS) ./gxk/libgxk.a $(GXK_LIBS) $(top_builddir)/bse/libbse-@MAJOR@.la $(RAPICORN_LIBS) $(BSE_LIBS) $(PYTHON_LIBS)
 
 noinst_PROGRAMS += tsmview
 tsmview_SOURCES  = tsmview.cc
--
2.7.4

_______________________________________________
beast mailing list
[hidden email]
https://mail.gnome.org/mailman/listinfo/beast
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 1/2] BUILD: update glib-gettext.m4 to latest version from glib git repo

Tim Janik-6
In reply to this post by Stefan Westerfeld
On 23.04.2016 16:33, Stefan Westerfeld wrote:

> @@ -378,10 +381,10 @@ glib_DEFUN([GLIB_GNU_GETTEXT],
>       posrcprefix="../"
>     fi
>     rm -f po/POTFILES
> -   test -e $srcdir/po/POTFILES.in && \
> -     sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
> +   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.]])

Hm, once you're at it, can you simply investigate how we get rid of the macro instead of introducing a deprecation warning for us?

I.e. what's the newest state of the art practice to deal with i18n instead of GLIB_GNU_GETTEXT?


--
Yours sincerely,
Tim Janik

https://testbit.eu/timj/
Free software author.

_______________________________________________
beast mailing list
[hidden email]
https://mail.gnome.org/mailman/listinfo/beast