summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-09-24 20:40:31 +0200
committerAlexander Barton <alex@barton.de>2012-09-24 20:40:31 +0200
commite65a35e964e6a32de748f18e1f70ffe2ad146119 (patch)
treecf72233542cfd00c5e5dff484e9ae88a62c02e84
parent78d189fbf745741f42271557206cdde60d3ae857 (diff)
downloadngircd-e65a35e964e6a32de748f18e1f70ffe2ad146119.tar.gz
ngircd-e65a35e964e6a32de748f18e1f70ffe2ad146119.zip
Rename configure.in to configure.ac
This fixes

  automake: warning: autoconf input should be named 'configure.ac',
  not 'configure.in'

when running the autogen.sh script.
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh4
3 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 4ccaedf1..e7ab7580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ build-stamp-ngircd*
 config.log
 config.status
 configure
-configure.in
+configure.ac
 configure.lineno
 cscope.out
 debian
diff --git a/Makefile.am b/Makefile.am
index 1edd751b..43b37e75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors
+# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@ clean-local:
 
 maintainer-clean-local:
 	rm -rf autom4te.cache
-	rm -f Makefile.in Makefile aclocal.m4 configure
+	rm -f Makefile.in Makefile aclocal.m4 configure configure.ac
 	rm -f ar-lib mkinstalldirs missing depcomp install-sh
 	rm -f config.log debian
 
diff --git a/autogen.sh b/autogen.sh
index 47c476c7..6c2a8dd1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -162,13 +162,13 @@ AM_MAKEFILES="src/ipaddr/Makefile.ng src/ngircd/Makefile.ng src/testsuite/Makefi
 if [ "$AM_MAJOR" -eq "1" -a "$AM_MINOR" -lt "12" ]; then
 	# automake < 1.12 => automatic de-ANSI-fication support available
 	echo "Enabling de-ANSI-fication support (automake $AM_VERSION) ..."
-	sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.in
+	sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.ac
 	DEANSI_START=""
 	DEANSI_END=""
 else
 	# automake >= 1.12 => no de-ANSI-fication support available
 	echo "Disabling de-ANSI-fication support (automake $AM_VERSION) ..."
-	sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.in
+	sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.ac
 	DEANSI_START="#"
 	DEANSI_END="	# disabled by ./autogen.sh script"
 fi