diff options
| -rw-r--r-- | README.win32 | 2 | ||||
| -rw-r--r-- | config.h.win32.in | 2 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 4 | ||||
| -rw-r--r-- | glib/gmem.c | 2 | ||||
| -rw-r--r-- | glib/gthread.c | 4 | ||||
| -rw-r--r-- | m4macros/glib-gettext.m4 | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/README.win32 b/README.win32 index 22300b2cf..25d06aeb8 100644 --- a/README.win32 +++ b/README.win32 @@ -153,7 +153,7 @@ something that libtool has added. The -0 suffix is added by libtool and is the value of "LT_CURRENT - LT_AGE". The 0 should *not* be thought to be part of the version number of GLib. The LT_CURRENT - LT_AGE value will on purpose be kept as zero as long as binary -compatibility is maintained. For the gory details, see configure.in +compatibility is maintained. For the gory details, see configure.ac and libtool documentation. Building with Visual Studio diff --git a/config.h.win32.in b/config.h.win32.in index 34a52779a..a94aa0b9a 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -1,6 +1,6 @@ /* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */ /* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define if building universal (internal helper macro) */ /* #undef AC_APPLE_UNIVERSAL_BUILD */ diff --git a/configure.in b/configure.ac index bc4e27b8d..f25ae42e6 100644 --- a/configure.in +++ b/configure.ac @@ -6,7 +6,7 @@ dnl *********************************** dnl *** include special GLib macros *** dnl *********************************** -m4_define(glib_configure_in) +m4_define(glib_configure_ac) # # The following version number definitions apply to GLib, GModule, GObject, @@ -2918,7 +2918,7 @@ AC_CONFIG_COMMANDS([glib/glibconfig.h], cat > $outfile <<\_______EOF /* glibconfig.h * - * This is a generated file. Please modify 'configure.in' + * This is a generated file. Please modify 'configure.ac' */ #ifndef __G_LIBCONFIG_H__ diff --git a/glib/gmem.c b/glib/gmem.c index a9c3710d5..1e92ffd19 100644 --- a/glib/gmem.c +++ b/glib/gmem.c @@ -50,7 +50,7 @@ * g_mem_profile(). * REALLOC_0_WORKS is defined if g_realloc (NULL, x) works. * SANE_MALLOC_PROTOS is defined if the systems malloc() and friends functions - * match the corresponding GLib prototypes, keep configure.in and gmem.h in sync here. + * match the corresponding GLib prototypes, keep configure.ac and gmem.h in sync here. * g_mem_gc_friendly is TRUE, freed memory should be 0-wiped. */ diff --git a/glib/gthread.c b/glib/gthread.c index 5d50d884b..2a00c60a9 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -1242,7 +1242,7 @@ g_static_mutex_init (GStaticMutex *mutex) * a GMutex. In that case, the first access we make to the static mutex * must first allocate the normal GMutex and store it into the pointer. * - * configure.in writes macros into glibconfig.h to determine if + * configure.ac writes macros into glibconfig.h to determine if * g_static_mutex_get_mutex() accesses the sturcture in memory directly * (on platforms where we are able to do that) or if it ends up here, * where we may have to allocate the GMutex before returning it. @@ -1327,7 +1327,7 @@ g_static_mutex_free (GStaticMutex* mutex) g_return_if_fail (mutex); /* The runtime_mutex is the first (or only) member of GStaticMutex, - * see both versions (of glibconfig.h) in configure.in. Note, that + * see both versions (of glibconfig.h) in configure.ac. Note, that * this variable is NULL, if g_thread_init() hasn't been called or * if we're using the default thread implementation and it provides * static mutexes. */ diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 index 68b08b3f4..77aa9f63f 100644 --- a/m4macros/glib-gettext.m4 +++ b/m4macros/glib-gettext.m4 @@ -280,7 +280,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" @@ -409,7 +409,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 |