From da57ffab4990e57fd9cb8f2c6afbc09f7c92e76f Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sun, 25 Sep 2016 10:05:24 +0000 Subject: [PATCH] configure.in renamed to configure.ac Fixes GH issue #65 --- .svn-revision | 2 +- Makefile.in | 2 +- autogen.sh | 8 ++++---- config.h.in | 2 +- configure.in => configure.ac | 2 +- docs/Makefile.in | 2 +- docs/man/Makefile.in | 2 +- m4/wxwin.m4 | 2 +- src/Makefile.in | 2 +- src/libs/Makefile.in | 2 +- src/libs/common/Makefile.in | 2 +- src/libs/ec/Makefile.in | 2 +- src/libs/ec/cpp/Makefile.in | 2 +- src/pixmaps/Makefile.in | 2 +- src/pixmaps/flags_xpm/Makefile.in | 2 +- src/skins/Makefile.in | 2 +- src/utils/Makefile.in | 2 +- src/utils/aLinkCreator/Makefile.in | 2 +- src/utils/aLinkCreator/docs/Makefile.in | 2 +- src/utils/aLinkCreator/src/Makefile.in | 2 +- src/utils/cas/Makefile.in | 2 +- src/utils/cas/docs/Makefile.in | 2 +- src/utils/fileview/Makefile.in | 2 +- src/utils/plasmamule/Makefile.in | 2 +- src/utils/scripts/version_bumper | 4 ++-- src/utils/scripts/whitespace_fixer | 2 +- src/utils/scripts/year_bumper | 6 +++--- src/utils/wxCas/Makefile.in | 2 +- src/utils/wxCas/docs/Makefile.in | 2 +- src/utils/wxCas/src/Makefile.in | 2 +- src/utils/xas/Makefile.in | 2 +- src/utils/xas/docs/Makefile.in | 2 +- src/webserver/Makefile.in | 2 +- src/webserver/default/Makefile.in | 2 +- src/webserver/src/Makefile.in | 2 +- unittests/Makefile.in | 2 +- unittests/muleunit/Makefile.in | 2 +- unittests/tests/Makefile.in | 2 +- 38 files changed, 44 insertions(+), 44 deletions(-) rename configure.in => configure.ac (99%) diff --git a/.svn-revision b/.svn-revision index 37ace159..1f4cfddf 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -10960 +10962 diff --git a/Makefile.in b/Makefile.in index d8f01246..7ec726b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -67,7 +67,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/autogen.sh b/autogen.sh index 80cd9016..cfb31867 100755 --- a/autogen.sh +++ b/autogen.sh @@ -26,9 +26,9 @@ fi # Determine version of gettext. gettext_version=`gettext --version | head -n 1 | sed -e 's/[^0]*\(0\.[0-9][^ ]*\).*/\1/'` -confver=`cat configure.in | grep '^AM_GNU_GETTEXT_VERSION(' | sed -e 's/^AM_GNU_GETTEXT_VERSION(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` +confver=`cat configure.ac | grep '^AM_GNU_GETTEXT_VERSION(' | sed -e 's/^AM_GNU_GETTEXT_VERSION(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` -# Require version as specified in configure.in. +# Require version as specified in configure.ac. if expr "$confver" \> "$gettext_version" >/dev/null; then gettext --version | head -n 1 echo "Fatal error: gettext version "$confver" or higher is required." @@ -60,9 +60,9 @@ fi # CONFIG_FILES=intl/Makefile CONFIG_HEADERS= /bin/sh ./config.status # fi # gettextize --intl -f --no-changelog -# echo "restoring Makefile.am and configure.in" +# echo "restoring Makefile.am and configure.ac" # cp -f Makefile.am~ Makefile.am -# cp -f configure.in~ configure.in +# cp -f configure.ac~ configure.ac #fi echo "Running aclocal -I m4" diff --git a/config.h.in b/config.h.in index 23b783b3..39a945aa 100644 --- a/config.h.in +++ b/config.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have and are using Boost.Asio for networking. */ diff --git a/configure.in b/configure.ac similarity index 99% rename from configure.in rename to configure.ac index cd2d3e33..70f9a508 100644 --- a/configure.in +++ b/configure.ac @@ -329,7 +329,7 @@ dnl Use the C compiler for the gettext library checks AC_LANG_POP([C++]) # Checking Native Language Support dnl Sets gettext version. -dnl AM_GNU_GETTEXT_VERSION *must not* be moved away from configure.in! +dnl AM_GNU_GETTEXT_VERSION *must not* be moved away from configure.ac! AM_GNU_GETTEXT_VERSION(0.11.5) MULE_CHECK_NLS AC_LANG_PUSH([C++]) diff --git a/docs/Makefile.in b/docs/Makefile.in index 557ef455..6922474c 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/docs/man/Makefile.in b/docs/man/Makefile.in index 6fe38877..6b1e4869 100644 --- a/docs/man/Makefile.in +++ b/docs/man/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/m4/wxwin.m4 b/m4/wxwin.m4 index 77ebaf98..4f5b1f74 100644 --- a/m4/wxwin.m4 +++ b/m4/wxwin.m4 @@ -34,7 +34,7 @@ dnl =========================================================================== dnl --------------------------------------------------------------------------- -dnl Macros for wxWidgets detection. Typically used in configure.in as: +dnl Macros for wxWidgets detection. Typically used in configure.ac as: dnl dnl AC_ARG_ENABLE(...) dnl AC_ARG_WITH(...) diff --git a/src/Makefile.in b/src/Makefile.in index 436cc1c0..fc3456d7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -78,7 +78,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/libs/Makefile.in b/src/libs/Makefile.in index 1709f105..98689420 100644 --- a/src/libs/Makefile.in +++ b/src/libs/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/libs/common/Makefile.in b/src/libs/common/Makefile.in index eda328a9..5f6610fd 100644 --- a/src/libs/common/Makefile.in +++ b/src/libs/common/Makefile.in @@ -58,7 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/libs/ec/Makefile.in b/src/libs/ec/Makefile.in index 690aa31d..f925f17f 100644 --- a/src/libs/ec/Makefile.in +++ b/src/libs/ec/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/libs/ec/cpp/Makefile.in b/src/libs/ec/cpp/Makefile.in index e3dcea94..fe41c1ea 100644 --- a/src/libs/ec/cpp/Makefile.in +++ b/src/libs/ec/cpp/Makefile.in @@ -58,7 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/pixmaps/Makefile.in b/src/pixmaps/Makefile.in index fbf34143..28166a0d 100644 --- a/src/pixmaps/Makefile.in +++ b/src/pixmaps/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/pixmaps/flags_xpm/Makefile.in b/src/pixmaps/flags_xpm/Makefile.in index 955115f2..652d7a99 100644 --- a/src/pixmaps/flags_xpm/Makefile.in +++ b/src/pixmaps/flags_xpm/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/skins/Makefile.in b/src/skins/Makefile.in index b91fcd8d..4ca29494 100644 --- a/src/skins/Makefile.in +++ b/src/skins/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in index eaf68f9f..fa88f0a1 100644 --- a/src/utils/Makefile.in +++ b/src/utils/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/aLinkCreator/Makefile.in b/src/utils/aLinkCreator/Makefile.in index 6c3ff5c5..6d0cd385 100644 --- a/src/utils/aLinkCreator/Makefile.in +++ b/src/utils/aLinkCreator/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/aLinkCreator/docs/Makefile.in b/src/utils/aLinkCreator/docs/Makefile.in index 1dc0bf9d..a4243d25 100644 --- a/src/utils/aLinkCreator/docs/Makefile.in +++ b/src/utils/aLinkCreator/docs/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/aLinkCreator/src/Makefile.in b/src/utils/aLinkCreator/src/Makefile.in index 37cb0119..69292909 100644 --- a/src/utils/aLinkCreator/src/Makefile.in +++ b/src/utils/aLinkCreator/src/Makefile.in @@ -62,7 +62,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/cas/Makefile.in b/src/utils/cas/Makefile.in index dfedc100..f43c205f 100644 --- a/src/utils/cas/Makefile.in +++ b/src/utils/cas/Makefile.in @@ -61,7 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/cas/docs/Makefile.in b/src/utils/cas/docs/Makefile.in index f1b8edfe..4000e195 100644 --- a/src/utils/cas/docs/Makefile.in +++ b/src/utils/cas/docs/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/fileview/Makefile.in b/src/utils/fileview/Makefile.in index 91bdc685..59c40859 100644 --- a/src/utils/fileview/Makefile.in +++ b/src/utils/fileview/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/plasmamule/Makefile.in b/src/utils/plasmamule/Makefile.in index 1c28a038..33b0b8ce 100644 --- a/src/utils/plasmamule/Makefile.in +++ b/src/utils/plasmamule/Makefile.in @@ -64,7 +64,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/scripts/version_bumper b/src/utils/scripts/version_bumper index a30ea1a8..d6028a6e 100755 --- a/src/utils/scripts/version_bumper +++ b/src/utils/scripts/version_bumper @@ -33,7 +33,7 @@ if test x"$1" = x""; then echo -e "\tUpdates current version to 2.1.1 \(autodetect old version\) -> version_bumper 2.1.1" echo " - This script is buggy and can kill your dog. Be careful. -" else - if test x"`ls configure.in`" = x""; then + if test x"`ls configure.ac`" = x""; then echo "This script must be run on aMule base directory." else OLD_VERSION=$1 @@ -51,7 +51,7 @@ else else echo "Bumping from $OLD_VERSION to $NEW_VERSION" #Command: - sed -i "s/$OLD_VERSION/$NEW_VERSION/g" aMule.app/Contents/Info.plist configure.in src/include/common/ClientVersion.h docs/Doxyfile aMule.spec po/*.po + sed -i "s/$OLD_VERSION/$NEW_VERSION/g" aMule.app/Contents/Info.plist configure.ac src/include/common/ClientVersion.h docs/Doxyfile aMule.spec po/*.po sed -i -r "s/VERSION_MJR\s+(0x0)?`echo $OLD_VERSION | cut -d "." -f 1`/VERSION_MJR\t\t`echo $NEW_VERSION | cut -d "." -f 1`/g" src/include/common/ClientVersion.h sed -i -r "s/VERSION_MIN\s+(0x0)?`echo $OLD_VERSION | cut -d "." -f 2`/VERSION_MIN\t\t`echo $NEW_VERSION | cut -d "." -f 2`/g" src/include/common/ClientVersion.h sed -i -r "s/VERSION_UPDATE\s+(0x0)?`echo $OLD_VERSION | cut -d "." -f 3`/VERSION_UPDATE\t\t`echo $NEW_VERSION | cut -d "." -f 3`/g" src/include/common/ClientVersion.h diff --git a/src/utils/scripts/whitespace_fixer b/src/utils/scripts/whitespace_fixer index ceb3e1f7..71129487 100755 --- a/src/utils/scripts/whitespace_fixer +++ b/src/utils/scripts/whitespace_fixer @@ -1,6 +1,6 @@ #!/bin/sh -eu -if [ ! -f './configure.in' ]; then +if [ ! -f './configure.ac' ]; then echo "Error: You must run this script from the source root directory!" exit 1 fi diff --git a/src/utils/scripts/year_bumper b/src/utils/scripts/year_bumper index 024d1a86..fd923c05 100755 --- a/src/utils/scripts/year_bumper +++ b/src/utils/scripts/year_bumper @@ -22,10 +22,10 @@ # Usage: # year_bumper [oldyear [newyear]] # -# oldyear defaults to the year found in configure.in +# oldyear defaults to the year found in configure.ac # newyear defaults to the current year -if [ ! -f ./configure.in ]; then +if [ ! -f ./configure.ac ]; then echo "This script must be run from the source root directory!" exit 1 fi @@ -33,7 +33,7 @@ fi if [ $# -ge 1 ]; then oldyear="$1" else - oldyear=`sed -e 's/# Copyright (c) 2003-\([0-9]\{4\}\).*/\1/;t;d' ./configure.in` + oldyear=`sed -e 's/# Copyright (c) 2003-\([0-9]\{4\}\).*/\1/;t;d' ./configure.ac` fi if [ $# -ge 2 ]; then diff --git a/src/utils/wxCas/Makefile.in b/src/utils/wxCas/Makefile.in index 95112fdc..fd563b9a 100644 --- a/src/utils/wxCas/Makefile.in +++ b/src/utils/wxCas/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/wxCas/docs/Makefile.in b/src/utils/wxCas/docs/Makefile.in index 892c8d0f..a8ed5eff 100644 --- a/src/utils/wxCas/docs/Makefile.in +++ b/src/utils/wxCas/docs/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/wxCas/src/Makefile.in b/src/utils/wxCas/src/Makefile.in index af6932ba..844d143a 100644 --- a/src/utils/wxCas/src/Makefile.in +++ b/src/utils/wxCas/src/Makefile.in @@ -60,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/xas/Makefile.in b/src/utils/xas/Makefile.in index d4a6221f..57fd19e3 100644 --- a/src/utils/xas/Makefile.in +++ b/src/utils/xas/Makefile.in @@ -58,7 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/utils/xas/docs/Makefile.in b/src/utils/xas/docs/Makefile.in index cd34c064..564ca9c7 100644 --- a/src/utils/xas/docs/Makefile.in +++ b/src/utils/xas/docs/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/webserver/Makefile.in b/src/webserver/Makefile.in index 3f04761c..0b658389 100644 --- a/src/webserver/Makefile.in +++ b/src/webserver/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/webserver/default/Makefile.in b/src/webserver/default/Makefile.in index 56fce47f..e3c66bdc 100644 --- a/src/webserver/default/Makefile.in +++ b/src/webserver/default/Makefile.in @@ -57,7 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/src/webserver/src/Makefile.in b/src/webserver/src/Makefile.in index 2745e6a2..c2cfed24 100644 --- a/src/webserver/src/Makefile.in +++ b/src/webserver/src/Makefile.in @@ -59,7 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/unittests/Makefile.in b/unittests/Makefile.in index e133ba4c..1454978e 100644 --- a/unittests/Makefile.in +++ b/unittests/Makefile.in @@ -55,7 +55,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/unittests/muleunit/Makefile.in b/unittests/muleunit/Makefile.in index 7020bbe8..9f9ff600 100644 --- a/unittests/muleunit/Makefile.in +++ b/unittests/muleunit/Makefile.in @@ -56,7 +56,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/unittests/tests/Makefile.in b/unittests/tests/Makefile.in index c871f387..5059a290 100644 --- a/unittests/tests/Makefile.in +++ b/unittests/tests/Makefile.in @@ -60,7 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \ $(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \ $(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \ $(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -- 2.11.4.GIT