Skip to content

Commit

Permalink
* configure.ac: Renamed from configure.in
Browse files Browse the repository at this point in the history
* configure.in: Renamed to configure.ac
* config/amanda/i18n.m4, config/amanda/progs.m4,
  config/compile, config/config.guess,
  config/macro-archive/ac_prog_swig.m4, packaging/README,
  packaging/rpm/buildpkg: s/configure.in/configure.ac/


git-svn-id: https://svn.code.sf.net/p/amanda/code/amanda/trunk@6537 a8d146d6-cc15-0410-8900-af154a0219e0
  • Loading branch information
Jean-Louis Martineau committed Feb 11, 2016
1 parent dc82def commit d236f97
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 5 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2016-02-11 Jean-Louis Martineau <[email protected]>
* configure.ac: Renamed from configure.in
* configure.in: Renamed to configure.ac
* config/amanda/i18n.m4, config/amanda/progs.m4,
config/compile, config/config.guess,
config/macro-archive/ac_prog_swig.m4, packaging/README,
packaging/rpm/buildpkg: s/configure.in/configure.ac/

2016-02-09 Jean-Louis Martineau <[email protected]>
* installcheck/amgetconf.pl: s/unknown/Unknown/

Expand Down
2 changes: 1 addition & 1 deletion config/amanda/i18n.m4
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# OVERVIEW
#
# Set up Amanda's internationalization support. Note that configure.in
# Set up Amanda's internationalization support. Note that configure.ac
# itself must contain (not indented):
#
# AM_GNU_GETTEXT_VERSION([0.15])
Expand Down
2 changes: 1 addition & 1 deletion config/amanda/progs.m4
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# of those macros has been omitted.
#
# All of these macros indicate their requirements using AC_REQUIRE, so the order in
# which they are called in configure.in is inconsequential.
# which they are called in configure.ac is inconsequential.

# SYNOPSIS
#
Expand Down
2 changes: 1 addition & 1 deletion config/macro-archive/ac_prog_swig.m4
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks
# that the swig package is this version number or higher.
#
# In configure.in, use as:
# In configure.ac, use as:
#
# AC_PROG_SWIG(1.3.17)
# SWIG_ENABLE_CXX
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packaging/README
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ script will actually build the package with Zmanda's defaults for you.
Notes:
-deb package changelog is non-standard when checked out. either use
packaging/deb/buildpkg to build the package, or replace %%VERSION%% with
the correct number supplied in configure.in at approximately line 10:
the correct number supplied in configure.ac at approximately line 10:
AM_INIT_AUTOMAKE( ... )

See http://wiki.zmanda.com/index.php/Installation for more information.
2 changes: 1 addition & 1 deletion packaging/rpm/buildpkg
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# This is useful for debugging
set -x
# Check for $AMVER, or pull it from configure.in
# Check for $AMVER, or pull it from configure.ac
if [ -z $AMVER ]; then
VER=`cat FULL_VERSION`
AMVER=amanda-${VER}
Expand Down

0 comments on commit d236f97

Please sign in to comment.