Commit 816afd30 authored by Romain Bouvier's avatar Romain Bouvier
Browse files

build: Fix intltool lock file problem during make distcheck

- See https://mail.xfce.org/pipermail/xfce4-dev/2022-May/032915.html
- Also update configure.ac syntax
parent 5fb94c14
Pipeline #15393 passed with stages
in 2 minutes and 56 seconds
......@@ -30,4 +30,5 @@ dist-hook: ChangeLog
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
intltool-update \
./po/.intltool-merge-cache.lock
......@@ -50,16 +50,16 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl *******************************
dnl *** Check for UNIX variants ***
dnl *******************************
AC_AIX()
AC_ISC_POSIX()
AC_MINIX()
AC_USE_SYSTEM_EXTENSIONS
AC_SEARCH_LIBS([strerror],[cposix])
AC_USE_SYSTEM_EXTENSIONS
dnl ********************************
dnl *** Check for basic programs ***
dnl ********************************
AC_PROG_CC()
AM_PROG_CC_C_O
AC_PROG_LD()
LT_PATH_LD([])
AC_PROG_INSTALL()
IT_PROG_INTLTOOL([0.35.0], [no-xml])
AC_CHECK_PROGS([PYTHON], [python3 python])
......@@ -140,8 +140,7 @@ dnl ***********************************
dnl *** Optional support for hwdata ***
dnl ***********************************
AC_ARG_WITH([pnp-ids-path],
[AC_HELP_STRING([--with-pnp-ids-path],
[Specify the path to pnp.ids (default=\${datadir}/hwdata/pnp.ids)])],
[AS_HELP_STRING([--with-pnp-ids-path],[Specify the path to pnp.ids (default=\${datadir}/hwdata/pnp.ids)])],
[with_pnp_ids_path=$withval],
[with_pnp_ids_path="\${datadir}/hwdata/pnp.ids"])
PNP_IDS=$with_pnp_ids_path
......@@ -196,8 +195,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBXKLAVIER5], [libxklavier], [5.0],
dnl make pluggable settings dialogs optional
AC_ARG_ENABLE([pluggable-dialogs],
[AC_HELP_STRING([--enable-pluggable-dialogs],
[Enable support for embedded settings dialogs (default=disabled)])],
[AS_HELP_STRING([--enable-pluggable-dialogs],[Enable support for embedded settings dialogs (default=disabled)])],
[enable_pluggable_dialogs=$enableval],
[enable_pluggable_dialogs=no])
if test x"$enable_pluggable_dialogs" = x"yes"; then
......@@ -212,8 +210,7 @@ dnl ****************************************
dnl Camberra XSettings
AC_ARG_ENABLE([sound-settings],
[AC_HELP_STRING([--enable-sound-settings],
[Enable sound XSETTINGS in GUI (from libcanberra) (default=no)])],
[AS_HELP_STRING([--enable-sound-settings],[Enable sound XSETTINGS in GUI (from libcanberra) (default=no)])],
[enable_sound_settings=$enableval],
[enable_sound_settings=no])
if test x"$enable_sound_settings" = x"yes"; then
......@@ -226,8 +223,7 @@ dnl ******************************
dnl *** Set helper path prefix ***
dnl ******************************
AC_ARG_WITH([helper-path-prefix],
[AC_HELP_STRING([--with-helper-path-prefix=PATH],
[Path prefix under which helper executables will be installed (default: $libdir)])],
[AS_HELP_STRING([--with-helper-path-prefix=PATH],[Path prefix under which helper executables will be installed (default: $libdir)])],
[HELPER_PATH_PREFIX="$withval"],
[HELPER_PATH_PREFIX="$libdir"])
AC_SUBST([HELPER_PATH_PREFIX])
......@@ -255,7 +251,7 @@ AC_MSG_CHECKING([PLATFORM_LDFLAGS])
AC_MSG_RESULT([$PLATFORM_LDFLAGS])
AC_SUBST([PLATFORM_LDFLAGS])
AC_OUTPUT([
AC_CONFIG_FILES([
Makefile
po/Makefile.in
common/Makefile
......@@ -279,6 +275,7 @@ xfsettingsd/Makefile
xfce4-settings-manager/Makefile
xfce4-settings-editor/Makefile
])
AC_OUTPUT
dnl ***************************
dnl *** Print configuration ***
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment