diff options
| author | Emanuele Giaquinta <exg@irssi.org> | 2008-02-16 11:13:45 +0000 |
|---|---|---|
| committer | exg <exg@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2008-02-16 11:13:45 +0000 |
| commit | a0400dc3d23c01655b15a4486f8bd5b3c97b75cc (patch) | |
| tree | c59a8d61451d9ff87c9406eed2eb516e9b7ea115 | |
| parent | 84356d4266da44ba3cfe6d4d52cbb8afcbabd409 (diff) | |
| download | irssi-a0400dc3d23c01655b15a4486f8bd5b3c97b75cc.zip | |
Rename config.h to irssi-config.h to avoid collisions.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4714 dbcabf3a-b0e7-0310-adc4-f8d773084564
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/common.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 92c19c6d..6e62fe15 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,7 +16,7 @@ conf_DATA = irssi.conf themedir = $(datadir)/irssi/themes theme_DATA = default.theme colorless.theme -pkginclude_HEADERS = config.h irssi-version.h +pkginclude_HEADERS = irssi-config.h irssi-version.h noinst_HEADERS = irssi-version.h.in diff --git a/configure.in b/configure.in index 2b885374..c0980288 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([src]) AC_CONFIG_AUX_DIR(build-aux) AC_PREREQ(2.50) -AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_HEADERS([irssi-config.h]) AM_INIT_AUTOMAKE([1.9 no-define]) AM_MAINTAINER_MODE diff --git a/src/common.h b/src/common.h index 78d38d6e..8cecdad0 100644 --- a/src/common.h +++ b/src/common.h @@ -13,7 +13,7 @@ #define DEFAULT_SERVER_ADD_PORT 6667 #ifdef HAVE_CONFIG_H -#include "config.h" +#include "irssi-config.h" #endif #include <stdio.h> |