* m4/setlocale_null.m4: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
All uses changed.
* NEWS: Mention the change
+2023-01-07 Bruno Haible <bruno@clisp.org>
+
+ setlocale-null: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
+ * m4/setlocale_null.m4: Rename LIB_SETLOCALE_NULL to SETLOCALE_NULL_LIB.
+ All uses changed.
+ * NEWS: Mention the change
+
2023-01-07 Bruno Haible <bruno@clisp.org>
setlocale: Rename LIB_SETLOCALE to SETLOCALE_LIB.
Date Modules Changes
+2023-01-07 setlocale-null Link with $(SETLOCALE_NULL_LIB) instead of
+ $(LIB_SETLOCALE_NULL).
+
2023-01-07 setlocale Link with $(SETLOCALE_LIB) instead of
$(LIB_SETLOCALE).
-# duplocale.m4 serial 13
+# duplocale.m4 serial 14
dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
HAVE_DUPLOCALE=0
fi
if test $REPLACE_DUPLOCALE = 1; then
- DUPLOCALE_LIB="$LIB_SETLOCALE_NULL"
+ DUPLOCALE_LIB="$SETLOCALE_NULL_LIB"
else
DUPLOCALE_LIB=
fi
-# nl_langinfo.m4 serial 8
+# nl_langinfo.m4 serial 9
dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
HAVE_NL_LANGINFO=0
fi
if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then
- LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL"
+ LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB"
else
LIB_NL_LANGINFO=
fi
-# setlocale.m4 serial 8
+# setlocale.m4 serial 9
dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
fi
if test $NEED_SETLOCALE_MTSAFE = 1; then
- SETLOCALE_LIB="$LIB_SETLOCALE_NULL"
+ SETLOCALE_LIB="$SETLOCALE_NULL_LIB"
else
SETLOCALE_LIB=
fi
-# setlocale_null.m4 serial 5
+# setlocale_null.m4 serial 6
dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl Determine link dependencies of lib/setlocale_null.c and lib/setlocale-lock.c.
if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
case "$host_os" in
- mingw*) LIB_SETLOCALE_NULL= ;;
+ mingw*) SETLOCALE_NULL_LIB= ;;
*)
gl_WEAK_SYMBOLS
case "$gl_cv_have_weak" in
- *yes) LIB_SETLOCALE_NULL= ;;
- *) LIB_SETLOCALE_NULL="$LIBPTHREAD" ;;
+ *yes) SETLOCALE_NULL_LIB= ;;
+ *) SETLOCALE_NULL_LIB="$LIBPTHREAD" ;;
esac
;;
esac
else
- LIB_SETLOCALE_NULL=
+ SETLOCALE_NULL_LIB=
fi
- dnl LIB_SETLOCALE_NULL is expected to be '-pthread' or '-lpthread' on AIX
+ dnl SETLOCALE_NULL_LIB is expected to be '-pthread' or '-lpthread' on AIX
dnl with gcc or xlc, and empty otherwise.
+ AC_SUBST([SETLOCALE_NULL_LIB])
+ dnl For backward compatibility.
+ LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB"
AC_SUBST([LIB_SETLOCALE_NULL])
])
configure.ac:
AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
-HARD_LOCALE_LIB="$LIB_SETLOCALE_NULL"
+HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB"
AC_SUBST([HARD_LOCALE_LIB])
dnl For backward compatibility.
LIB_HARD_LOCALE="$HARD_LOCALE_LIB"
#include "setlocale_null.h" or #include <locale.h>
Link:
-$(LIB_SETLOCALE_NULL)
+$(SETLOCALE_NULL_LIB)
License:
LGPLv2+
test-setlocale_null \
test-setlocale_null-mt-one \
test-setlocale_null-mt-all
-test_setlocale_null_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@
-test_setlocale_null_mt_one_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
-test_setlocale_null_mt_all_LDADD = $(LDADD) @LIB_SETLOCALE_NULL@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
+test_setlocale_null_LDADD = $(LDADD) @SETLOCALE_NULL_LIB@
+test_setlocale_null_mt_one_LDADD = $(LDADD) @SETLOCALE_NULL_LIB@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
+test_setlocale_null_mt_all_LDADD = $(LDADD) @SETLOCALE_NULL_LIB@ $(LIBMULTITHREAD) $(NANOSLEEP_LIB)
int
main ()
{
- /* Check that setlocale_null_r() can be used with $(LIB_SETLOCALE_NULL). */
+ /* Check that setlocale_null_r() can be used with $(SETLOCALE_NULL_LIB). */
return setlocale_null_r (LC_ALL, buf, sizeof (buf)) != 0;
}