luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-12 13:49:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

acinclude.m4 removed the --disable-nls option. You can't disable Native

Browse Source 
2002-01-16  Sven Neumann  <sven@gimp.org>

        * acinclude.m4
        * m4macros/glib-gettext.m4: removed the --disable-nls option. You
        can't disable Native Language Support since we rely on it.

        * configure.in: nicer --help output.
This commit is contained in:
Sven Neumann 2002-01-16 19:29:16 +00:00 committed by Sven Neumann
parent a1f5b005fa
commit a1ebb7048f
11 changed files with 228 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-12
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
2002-01-16 Sven Neumann <sven@gimp.org>
* acinclude.m4
* m4macros/glib-gettext.m4: removed the --disable-nls option. You
can't disable Native Language Support since we rely on it.
* configure.in: nicer --help output.
Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com> Tue Jan 8 11:33:28 2002 Owen Taylor <otaylor@redhat.com>
* docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST. * docs/Makefile.am (EXTRA_DIST): Add text files to EXTRA_DIST.

19
acinclude.m4
View File

@ -20,18 +20,11 @@
# serial 5 # serial 5
AC_DEFUN(AM_GLIB_WITH_NLS, AC_DEFUN(AM_GLIB_WITH_NLS,
[AC_MSG_CHECKING([whether NLS is requested]) dnl NLS is obligatory
dnl Default is enabled NLS [USE_NLS=yes
AC_ARG_ENABLE(nls,
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS) AC_SUBST(USE_NLS)
USE_INCLUDED_LIBINTL=no dnl Figure out what method
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
nls_cv_force_use_gnu_gettext="no" nls_cv_force_use_gnu_gettext="no"
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@ -120,9 +113,7 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
# We need to process the po/ directory. # We need to process the po/ directory.
POSUB=po POSUB=po
else
DATADIRNAME=share
fi
AC_OUTPUT_COMMANDS( AC_OUTPUT_COMMANDS(
[case "$CONFIG_FILES" in *po/Makefile.in*) [case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@ -137,7 +128,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
done done
dnl Make all variables we use known to autoconf. dnl Make all variables we use known to autoconf.
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATALOGS) AC_SUBST(CATALOGS)
AC_SUBST(CATOBJEXT) AC_SUBST(CATOBJEXT)
AC_SUBST(DATADIRNAME) AC_SUBST(DATADIRNAME)
@ -235,6 +225,7 @@ strdup __argz_count __argz_stringify __argz_next])
< $srcdir/po/POTFILES.in > po/POTFILES < $srcdir/po/POTFILES.in > po/POTFILES
]) ])
dnl @synopsis AC_FUNC_VSNPRINTF_C99 dnl @synopsis AC_FUNC_VSNPRINTF_C99
dnl dnl
dnl Check whether there is a vsnprintf() function with C99 semantics installed. dnl Check whether there is a vsnprintf() function with C99 semantics installed.

2
configure.in
View File

@ -1512,7 +1512,7 @@ dnl ***********************
dnl *** Tests for iconv *** dnl *** Tests for iconv ***
dnl *********************** dnl ***********************
AC_ARG_WITH(libiconv, [ --with-libiconv Use the libiconv library ],,with_libiconv=maybe) AC_ARG_WITH(libiconv, [ --with-libiconv use the libiconv library ],,with_libiconv=maybe)
found_iconv=no found_iconv=no

18
m4macros/glib-gettext.m4
View File

@ -20,18 +20,11 @@
# serial 5 # serial 5
AC_DEFUN(AM_GLIB_WITH_NLS, AC_DEFUN(AM_GLIB_WITH_NLS,
[AC_MSG_CHECKING([whether NLS is requested]) dnl NLS is obligatory
dnl Default is enabled NLS [USE_NLS=yes
AC_ARG_ENABLE(nls,
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
AC_MSG_RESULT($USE_NLS)
AC_SUBST(USE_NLS) AC_SUBST(USE_NLS)
USE_INCLUDED_LIBINTL=no dnl Figure out what method
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
nls_cv_force_use_gnu_gettext="no" nls_cv_force_use_gnu_gettext="no"
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
@ -120,9 +113,7 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
# We need to process the po/ directory. # We need to process the po/ directory.
POSUB=po POSUB=po
else
DATADIRNAME=share
fi
AC_OUTPUT_COMMANDS( AC_OUTPUT_COMMANDS(
[case "$CONFIG_FILES" in *po/Makefile.in*) [case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
@ -137,7 +128,6 @@ AC_DEFUN(AM_GLIB_WITH_NLS,
done done
dnl Make all variables we use known to autoconf. dnl Make all variables we use known to autoconf.
AC_SUBST(USE_INCLUDED_LIBINTL)
AC_SUBST(CATALOGS) AC_SUBST(CATALOGS)
AC_SUBST(CATOBJEXT) AC_SUBST(CATOBJEXT)
AC_SUBST(DATADIRNAME) AC_SUBST(DATADIRNAME)