AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename configure.in to configure.ac

Browse Source 
In the autoconf manual the recomended name for the autoconf input file
is configure.ac and not configure.in. Follow this recomendation.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=598768
This commit is contained in:
Martin Nordholts 2010-05-07 09:53:03 +02:00 committed by Javier Jardón
parent 3781b24476
commit ccc53b9a45
5 changed files with 89 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in → configure.ac
View File

@ -58,7 +58,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
# #
# For each of the libraries we build, we define the following # For each of the libraries we build, we define the following
# substituted variables: # substituted variables:
# #
# foo_PACKAGES: pkg-config packages this library requires # foo_PACKAGES: pkg-config packages this library requires
@ -1258,10 +1257,10 @@ AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
AC_MSG_CHECKING(for x86 platform) AC_MSG_CHECKING(for x86 platform)
case $host_cpu in case $host_cpu in
i386|i486|i586|i686|i786|k6|k7) i386|i486|i586|i686|i786|k6|k7)
use_x86_asm=yes use_x86_asm=yes
;; ;;
*) *)
use_x86_asm=no use_x86_asm=no
esac esac
AC_MSG_RESULT($use_x86_asm) AC_MSG_RESULT($use_x86_asm)
@ -1551,7 +1550,7 @@ if test "x$gdktarget" = "xx11"; then
have_solaris_xinerama=false have_solaris_xinerama=false
AC_CHECK_FUNC(XineramaGetInfo, AC_CHECK_FUNC(XineramaGetInfo,
[AC_CHECK_HEADER(X11/extensions/xinerama.h, [AC_CHECK_HEADER(X11/extensions/xinerama.h,
[have_solaris_xinerama=true], :, [have_solaris_xinerama=true], :,
[#include <X11/Xlib.h>])]) [#include <X11/Xlib.h>])])
if $have_solaris_xinerama ; then if $have_solaris_xinerama ; then
@ -2030,7 +2029,7 @@ AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
cat > $outfile <<\_______EOF cat > $outfile <<\_______EOF
/* gdkconfig.h /* gdkconfig.h
* *
* This is a generated file. Please modify `configure.in' * This is a generated file. Please modify `configure.ac'
*/ */
#ifndef GDKCONFIG_H #ifndef GDKCONFIG_H

6
docs/RELEASE-HOWTO
View File

@ -29,9 +29,9 @@ Make sure that gtk-doc is the latest released version.
3) In particular, if this is a major, stable, release, verify that 3) In particular, if this is a major, stable, release, verify that
README.in contains the relevant release notes and that the README.in contains the relevant release notes and that the
required versions of dependencies in INSTALL.in are in sync required versions of dependencies in INSTALL.in are in sync
with configure.in. with configure.ac.
4) Verify that the version in configure.in has been bumped after the last 4) Verify that the version in configure.ac has been bumped after the last
release. (Note that this is critical, a slip-up here will cause the release. (Note that this is critical, a slip-up here will cause the
soname to change). soname to change).
@ -78,7 +78,7 @@ Make sure that gtk-doc is the latest released version.
git push origin refs/tags/2.12.10 git push origin refs/tags/2.12.10
13) Bump the version number in configure.in and commit and push this change 13) Bump the version number in configure.ac and commit and push this change
14) Upload the tarball to master.gnome.org and run install-module to transfer 14) Upload the tarball to master.gnome.org and run install-module to transfer
it to download.gnome.org. If you don't have an account on master.gnome.org, it to download.gnome.org. If you don't have an account on master.gnome.org,

4
docs/faq/gtk-faq.sgml
View File

@ -996,11 +996,11 @@ relevant packages. These are:</para>
or on any GNU mirror.</para> or on any GNU mirror.</para>
<para>In order to use the powerful autoconf/automake scheme, <para>In order to use the powerful autoconf/automake scheme,
you must create a configure.in which may look like:</para> you must create a configure.ac which may look like:</para>
<programlisting role="C"> <programlisting role="C">
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl configure.in for a GTK+ based program dnl configure.ac for a GTK+ based program
AC_INIT(myprg.c) AC_INIT(myprg.c)
AM_INIT_AUTOMAKE(mypkgname, 0.0.1) AM_INIT_AUTOMAKE(mypkgname, 0.0.1)

4
docs/gtk-config.txt
View File

@ -152,10 +152,10 @@ and the AM_PATH_GTK macro. The program used here is the testinput.c
You should first read the introductory portions of the automake You should first read the introductory portions of the automake
Manual, if you are not already familiar with it. Manual, if you are not already familiar with it.
Two files are needed, 'configure.in', which is used to build the Two files are needed, 'configure.ac', which is used to build the
configure script: configure script:
==configure.in=== ==configure.ac===
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_INIT(testinput.c) AC_INIT(testinput.c)

4
sanity_check
View File

@ -37,8 +37,8 @@ else
exit 1 exit 1
fi fi
echo -n "configure.in..." echo -n "configure.ac..."
if [ "x`grep $VERSION gtk+-$VERSION/configure.in | wc -l | awk -F' ' '{print $1}'`" == "x2" ]; then if [ "x`grep $VERSION gtk+-$VERSION/configure.ac | wc -l | awk -F' ' '{print $1}'`" == "x2" ]; then
echo "ok" echo "ok"
else else
echo "failed." echo "failed."