mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
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
This commit is contained in:
parent
84356d4266
commit
a0400dc3d2
@ -16,7 +16,7 @@ conf_DATA = irssi.conf
|
|||||||
themedir = $(datadir)/irssi/themes
|
themedir = $(datadir)/irssi/themes
|
||||||
theme_DATA = default.theme colorless.theme
|
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
|
noinst_HEADERS = irssi-version.h.in
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([src])
|
|||||||
AC_CONFIG_AUX_DIR(build-aux)
|
AC_CONFIG_AUX_DIR(build-aux)
|
||||||
AC_PREREQ(2.50)
|
AC_PREREQ(2.50)
|
||||||
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([irssi-config.h])
|
||||||
AM_INIT_AUTOMAKE([1.9 no-define])
|
AM_INIT_AUTOMAKE([1.9 no-define])
|
||||||
|
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#define DEFAULT_SERVER_ADD_PORT 6667
|
#define DEFAULT_SERVER_ADD_PORT 6667
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "irssi-config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user