aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Use autoconf PACKAGE_TARNAME/PACKAGE_VERSION macros rather than automake

Browse Source 
PACKAGE/VERSION ones.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4597 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-08-07 14:55:14 +00:00 committed by exg
parent 918b8400f4
commit de4c2af324
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
irssi-version.h.in
View File

@ -1,4 +1,3 @@
/* automatically created by configure */ /* automatically created by configure */
#define IRSSI_VERSION "@VERSION@"
#define IRSSI_VERSION_DATE @VERSION_DATE@ #define IRSSI_VERSION_DATE @VERSION_DATE@
#define IRSSI_VERSION_TIME @VERSION_TIME@ #define IRSSI_VERSION_TIME @VERSION_TIME@

2
src/core/args.c
View File

@ -45,7 +45,7 @@ void args_execute(int argc, char *argv[])
if (iopt_tables == NULL) if (iopt_tables == NULL)
return; return;
con = poptGetContext(PACKAGE, argc, argv, con = poptGetContext(PACKAGE_TARNAME, argc, argv,
(struct poptOption *) (iopt_tables->data), 0); (struct poptOption *) (iopt_tables->data), 0);
poptReadDefaultConfig(con, TRUE); poptReadDefaultConfig(con, TRUE);

2
src/core/expandos.c
View File

@ -319,7 +319,7 @@ static char *expando_last_invite(SERVER_REC *server, void *item, int *free_ret)
/* client version text string */ /* client version text string */
static char *expando_version(SERVER_REC *server, void *item, int *free_ret) static char *expando_version(SERVER_REC *server, void *item, int *free_ret)
{ {
return IRSSI_VERSION; return PACKAGE_VERSION;
} }
/* current value of CMDCHARS */ /* current value of CMDCHARS */

2
src/fe-common/core/fe-core-commands.c
View File

@ -106,7 +106,7 @@ static void cmd_version(char *data)
if (*data == '\0') { if (*data == '\0') {
g_snprintf(time, sizeof(time), "%04d", IRSSI_VERSION_TIME); g_snprintf(time, sizeof(time), "%04d", IRSSI_VERSION_TIME);
printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE, printtext(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
"Client: "PACKAGE" " IRSSI_VERSION" (%d %s)", "Client: "PACKAGE_TARNAME" " PACKAGE_VERSION" (%d %s)",
IRSSI_VERSION_DATE, time); IRSSI_VERSION_DATE, time);
} }
} }

2
src/fe-text/irssi.c
View File

@ -341,7 +341,7 @@ int main(int argc, char **argv)
args_execute(argc, argv); args_execute(argc, argv);
if (version) { if (version) {
printf(PACKAGE" " IRSSI_VERSION" (%d %04d)\n", printf(PACKAGE_TARNAME" " PACKAGE_VERSION" (%d %04d)\n",
IRSSI_VERSION_DATE, IRSSI_VERSION_TIME); IRSSI_VERSION_DATE, IRSSI_VERSION_TIME);
return 0; return 0;
} }

2
src/irc/core/ctcp.c
View File

@ -329,7 +329,7 @@ void ctcp_init(void)
ctcp_cmds = NULL; ctcp_cmds = NULL;
settings_add_str("misc", "ctcp_version_reply", settings_add_str("misc", "ctcp_version_reply",
PACKAGE" v$J - running on $sysname $sysarch"); PACKAGE_TARNAME" v$J - running on $sysname $sysarch");
settings_add_str("misc", "ctcp_userinfo_reply", "$Y"); settings_add_str("misc", "ctcp_userinfo_reply", "$Y");
settings_add_int("flood", "max_ctcp_queue", 5); settings_add_int("flood", "max_ctcp_queue", 5);

6
src/irc/proxy/dump.c
View File

@ -243,12 +243,12 @@ void proxy_dump_data(CLIENT_REC *client)
/* welcome info */ /* welcome info */
proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network\n", client->proxy_address, client->nick); proxy_outdata(client, ":%s 001 %s :Welcome to the Internet Relay Network\n", client->proxy_address, client->nick);
proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\n", client->proxy_address, client->nick, IRSSI_VERSION); proxy_outdata(client, ":%s 002 %s :Your host is irssi-proxy, running version %s\n", client->proxy_address, client->nick, PACKAGE_VERSION);
proxy_outdata(client, ":%s 003 %s :This server was created ...\n", client->proxy_address, client->nick); proxy_outdata(client, ":%s 003 %s :This server was created ...\n", client->proxy_address, client->nick);
if (client->server == NULL || !client->server->emode_known) if (client->server == NULL || !client->server->emode_known)
proxy_outdata(client, ":%s 004 %s %s %s oirw abiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, IRSSI_VERSION); proxy_outdata(client, ":%s 004 %s %s %s oirw abiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
else else
proxy_outdata(client, ":%s 004 %s %s %s oirw abeIiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, IRSSI_VERSION); proxy_outdata(client, ":%s 004 %s %s %s oirw abeIiklmnopqstv\n", client->proxy_address, client->nick, client->proxy_address, PACKAGE_VERSION);
if (client->server != NULL && client->server->isupport_sent) { if (client->server != NULL && client->server->isupport_sent) {
isupport_out = g_string_new(NULL); isupport_out = g_string_new(NULL);