Mirrors
/
gparted
mirror of https://gitlab.gnome.org/GNOME/gparted.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert workaround for .intltool-merge-cache.lock file being left behind (!107) 

Now that intltool is no longer used, the workaround for it leaving file
.intltool-merge-cache.lock behind is no longer needed.  Therefore revert
merge !103 "Fix make distcheck failure found in GitLab CI job
unbuntu_test".  This commit reverts both of these earlier commits in one
go:

    053691378c
    Resolve messages from configure in VPATH build (!103)

    0bd636a34b
    Fix up intltool leaving .intltool-merge-cache.lock file behind (!103)

Closes !107 - Migrate from intltool to gettext translation
This commit is contained in:
Mike Fleetwood 2022-11-06 21:58:46 +00:00 committed by Curtis Gedak
parent 0e46d6a7de
commit a141c048af
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -16,8 +16,6 @@ AC_PROG_CXX
AC_PROG_CC
LT_INIT
AC_PROG_AWK
AC_PROG_FGREP
AC_PROG_SED
dnl Check for pkg-config early to avoid splitting message when first used.
PKG_CHECK_EXISTS
@ -60,25 +58,6 @@ AM_GNU_GETTEXT_VERSION([0.19.8])
AM_GNU_GETTEXT([external])
dnl Check for and fix missing delete of intltool cache lock file. Only
dnl needed with intltool >= 0.51.0-5.1, but just always fix as that is
dnl simpler and safe.
AC_MSG_CHECKING([whether po/Makefile.in.in deletes intltool cache lock file])
file='po/Makefile.in.in'
if test ! -f "$srcdir/$file"; then
AC_MSG_RESULT([not applicable])
elif $FGREP -q '.intltool-merge-cache.lock' "$srcdir/$file" 2> /dev/null; then
AC_MSG_RESULT([yes])
else
test -w "$srcdir/$file" && \
$SED -i '/rm -f .intltool-merge-cache/s/$/ .intltool-merge-cache.lock/' "$srcdir/$file" 2> /dev/null
if $FGREP -q '.intltool-merge-cache.lock' "$srcdir/$file" 2> /dev/null; then
AC_MSG_RESULT([fixed])
else
AC_MSG_RESULT([no])
fi
fi
dnl======================
dnl checks for libs