[pisa-src] r1273 - in trunk: Makefile.am community-operator/co_server.c community-operator/hipl.c configure.ac include include/global.h test/packaging/create-package.sh test/packaging/pisa-rpm.spec
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 22 Oct 2009 12:43:24 +0200
Author: biurrun
Date: Thu Oct 22 12:43:24 2009
New Revision: 1273
Log:
Rename ac_config.h --> config.h.
config.h is the canonical name for a header containing configuration
information generated by configure.
Modified:
trunk/Makefile.am
trunk/community-operator/co_server.c
trunk/community-operator/hipl.c
trunk/configure.ac
trunk/include/ (props changed)
trunk/include/global.h
trunk/test/packaging/create-package.sh
trunk/test/packaging/pisa-rpm.spec
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am Thu Oct 22 12:22:09 2009 (r1272)
+++ trunk/Makefile.am Thu Oct 22 12:43:24 2009 (r1273)
@@ -26,7 +26,7 @@
pisaincludedir=$(includedir)
pisainclude_HEADERS= \
- include/ac_config.h \
+ include/config.h \
include/arp.h \
include/checksum.h \
include/cfg.h \
Modified: trunk/community-operator/co_server.c
==============================================================================
--- trunk/community-operator/co_server.c Thu Oct 22 12:22:09 2009
(r1272)
+++ trunk/community-operator/co_server.c Thu Oct 22 12:43:24 2009
(r1273)
@@ -10,7 +10,7 @@
#include <sys/select.h>
#include <signal.h>
-#include "ac_config.h"
+#include "config.h"
#include "global.h"
#include "debug.h"
#include "co_common_packets.h"
Modified: trunk/community-operator/hipl.c
==============================================================================
--- trunk/community-operator/hipl.c Thu Oct 22 12:22:09 2009 (r1272)
+++ trunk/community-operator/hipl.c Thu Oct 22 12:43:24 2009 (r1273)
@@ -4,7 +4,7 @@
*/
#include "hipl.h"
-#include "ac_config.h"
+#include "config.h"
#ifdef CONFIG_PISA_WITH_HIPL
# include "certtools.h" /* in libinet6 under the hipl source tree */
#endif /* CONFIG_PISA_WITH_HIPL */
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Thu Oct 22 12:22:09 2009 (r1272)
+++ trunk/configure.ac Thu Oct 22 12:43:24 2009 (r1273)
@@ -11,7 +11,7 @@
AC_INIT(pisa, [PISA_VERSION], pisa@xxxxxxxxxxxxx)
AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS([include/ac_config.h])
+AC_CONFIG_HEADERS([include/config.h])
AM_INIT_AUTOMAKE([foreign])
AC_CONFIG_MACRO_DIR([m4])
@@ -164,7 +164,7 @@
# Set default CFLAGS for the complete project.
AC_SUBST(CFLAGS, "-g -O2 -Wall")
-# This is needed to export the _expanded_ value of the variable to ac_config.h.
+# This is needed to export the _expanded_ value of the variable to config.h.
AC_DEFINE_UNQUOTED(PISA_SYSCONFDIR, "$(eval echo $sysconfdir)")
AH_TEMPLATE([PISA_SYSCONFDIR])
Modified: trunk/include/global.h
==============================================================================
--- trunk/include/global.h Thu Oct 22 12:22:09 2009 (r1272)
+++ trunk/include/global.h Thu Oct 22 12:43:24 2009 (r1273)
@@ -14,7 +14,7 @@
#ifndef PISA_GLOBAL_H
#define PISA_GLOBAL_H
-#include "ac_config.h"
+#include "config.h"
#include <stdio.h>
#include <stdint.h> /* uint*_t */
Modified: trunk/test/packaging/create-package.sh
==============================================================================
--- trunk/test/packaging/create-package.sh Thu Oct 22 12:22:09 2009
(r1272)
+++ trunk/test/packaging/create-package.sh Thu Oct 22 12:43:24 2009
(r1273)
@@ -171,7 +171,7 @@
set -e
-echo "Version: $(grep PACKAGE_VERSION $PKGROOT/include/ac_config.h|cut -d\"
-f2)" > $SPECFILE
+echo "Version: $(grep PACKAGE_VERSION $PKGROOT/include/config.h | cut -d\"
-f2)" > $SPECFILE
echo "Release: 1" >> $SPECFILE
# Set architecture, distro and repo details
Modified: trunk/test/packaging/pisa-rpm.spec
==============================================================================
--- trunk/test/packaging/pisa-rpm.spec Thu Oct 22 12:22:09 2009 (r1272)
+++ trunk/test/packaging/pisa-rpm.spec Thu Oct 22 12:43:24 2009 (r1273)
@@ -1,6 +1,6 @@
Name: pisa
Summary: Peer-to-Peer Wi-Fi Internet Sharing System
-# Note: Version and Release are created automatically from include/ac_config.h
+# Note: Version and Release are created automatically from include/config.h
URL: http://ds.informatik.rwth-aachen.de/
Source:
http://ds.informatik.rwth-aachen.de/pisa/release/sources/%{version}/pisa-%{version}.tar.gz
Packager: pisa@xxxxxxxxxxxxx
Other related posts:
- » [pisa-src] r1273 - in trunk: Makefile.am community-operator/co_server.c community-operator/hipl.c configure.ac include include/global.h test/packaging/create-package.sh test/packaging/pisa-rpm.spec - Diego Biurrun
