@@ -4,7 +4,7 @@ have_automake=false if automake --version < /dev/null > /dev/null 2>&1 ; then automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*$.*$/\1/'` case $automake_version in - 1.2*|1.3*|1.4|1.4*) + 1.2*|1.3*|1.4|1.4*|1.5*|1.6*|1.7*|1.8*) ;; *) have_automake=true @@ -15,11 +15,11 @@ if $have_automake ; then AUTOMAKE="automake" ACLOCAL="aclocal" else - if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE="automake-1.7" - ACLOCAL="aclocal-1.7" + if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then + AUTOMAKE="automake-1.9" + ACLOCAL="aclocal-1.9" else - echo "automake missing or too old. This requires atleast automake 1.5" + echo "automake missing or too old. This requires atleast automake 1.9" exit 1 fi fi autogen.sh @@ -1,14 +1,29 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(xchat, 2.6.2) +AC_INIT([XChat],[2.6.2],[http://www.xchat.org/],[xchat]) + +AC_PREREQ([2.59]) +AC_COPYRIGHT([Copyright (C) 1998-2006 Peter Zelezny]) + +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([configure.in]) + +AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define]) + AM_MAINTAINER_MODE AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_CPP AM_PROG_AS AM_DISABLE_STATIC -AM_PROG_LIBTOOL +AC_PROG_LIBTOOL + +dnl ----------------------------------------------------------- +dnl Language Support +dnl ----------------------------------------------------------- +GETTEXT_PACKAGE=xchat +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name]) ALL_LINGUAS="de el es fi fr gl hu ja ko nl pa sq sr sv vi zh_TW" AM_GNU_GETTEXT configure.in @@ -65,13 +65,13 @@ main (int argc, char **argv) GOptionContext *context = NULL; #ifdef ENABLE_NLS - bindtextdomain (PACKAGE, LOCALEDIR); - bind_textdomain_codeset (PACKAGE, "UTF-8"); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); #endif context = g_option_context_new (NULL); - g_option_context_add_main_entries (context, entries, PACKAGE); + g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_parse (context, &argc, &argv, &error); if (error) @@ -110,7 +110,7 @@ main (int argc, char **argv) if (fork() == 0) { gchar *url = g_strdup_printf ("--url=%s", opt_open_url); - execl (PREFIX"/bin/"PACKAGE, PACKAGE, "-a", url, NULL); + execl (PREFIX"/bin/"PACKAGE_NAME, PACKAGE_NAME, "-a", url, NULL); } } else write_error (_("Failed to complete command"), error); plugins/dbus/xchat-remote.c @@ -1306,7 +1306,7 @@ xchat_plugin_get_info (char **name, char **desc, char **version, { *name = "Perl"; *desc = "Perl scripting interface"; - *version = VERSION; + *version = PACKAGE_VERSION; if (reserved) *reserved = NULL; } @@ -1332,7 +1332,7 @@ xchat_plugin_init (xchat_plugin * plugin_handle, char **plugin_name, *plugin_name = "Perl"; *plugin_desc = "Perl scripting interface"; - *plugin_version = VERSION; + *plugin_version = PACKAGE_VERSION; xchat_hook_command (ph, "load", XCHAT_PRI_NORM, perl_command_load, 0, 0); xchat_hook_command (ph, "unload", XCHAT_PRI_NORM, perl_command_unload, 0, plugins/perl/perl.c @@ -38,7 +38,7 @@ margin-right: 32px; <h1>XChat 2.0 Plugin Interface</h1> -plugin20.html revision 2.63 +plugin20.html revision 2.64 Latest version of this document is available at: <a href="http://xchat.org/docs/plugin20.html">http://xchat.org/docs/plugin20.html</a> <h2>Information:</h2> @@ -710,7 +710,9 @@ removed, so you don't need to call this within your xchat_plugin_deinit() functi Prototype: int xchat_emit_print(xchat_plugin *ph, const char *event_name, ...); Description: Generates a print event. This can be any -event found in the Preferences > Advanced > Text Events window. +event found in the Preferences > Advanced > Text Events window. The vararg parameter list +MUST always be NULL terminated. Special care should be taken when calling this function +inside a print callback (from xchat_hook_print), as not to cause endless recursion. Arguments: <blockquote>ph: Plugin handle (as given to xchat_plugin_init). plugins/plugin20.html @@ -765,7 +765,7 @@ save_config (void) return 0; } - if (!cfg_put_str (fh, "version", VERSION)) + if (!cfg_put_str (fh, "version", PACKAGE_VERSION)) { free (new_config); return 0; src/common/cfgfiles.c @@ -129,7 +129,7 @@ ctcp_handle (session *sess, char *to, char *nick, if (!strcasecmp (msg, "VERSION") && !prefs.hidever) { - snprintf (outbuf, sizeof (outbuf), "VERSION xchat "VERSION" %s", + snprintf (outbuf, sizeof (outbuf), "VERSION xchat "PACKAGE_VERSION" %s", get_cpu_str ()); serv->p_nctcp (serv, nick, outbuf); } src/common/ctcp.c @@ -3522,7 +3522,7 @@ auto_insert (char *dest, int destlen, unsigned char *src, char *word[], utf[19] = 0; break; case 'v': - utf = VERSION; break; + utf = PACKAGE_VERSION; break; break; case 'y': now = time (0); src/common/outbound.c @@ -970,15 +970,16 @@ const char * xchat_get_info (xchat_plugin *ph, const char *id) { session *sess; + guint32 hash = str_hash (id); /* do the session independant ones first */ - switch (str_hash (id)) + switch (hash) { case 0x325acab5: /* libdirfs */ return XCHATLIBDIR; case 0x14f51cd8: /* version */ - return VERSION; + return PACKAGE_VERSION; case 0xdd9b1abd: /* xchatdir */ return get_xdir_utf8 (); @@ -994,7 +995,7 @@ xchat_get_info (xchat_plugin *ph, const char *id) return NULL; } - switch (str_hash (id)) + switch (hash) { case 0x2de2ee: /* away */ if (sess->server->is_away) @@ -1454,10 +1455,11 @@ int xchat_emit_print (xchat_plugin *ph, const char *event_name, ...) { va_list args; + /* currently only 4 because no events use more than 4. + This can be easily expanded without breaking the API. */ char *argv[4] = {NULL, NULL, NULL, NULL}; int i = 0; - memset (&argv, 0, sizeof (argv)); va_start (args, event_name); while (1) { src/common/plugin.c @@ -1034,7 +1034,7 @@ servlist_save (void) if (first) chmod (buf, 0600); #endif - fprintf (fp, "v="VERSION"\n\n"); + fprintf (fp, "v="PACKAGE_VERSION"\n\n"); list = network_list; while (list) src/common/servlist.c @@ -67,7 +67,7 @@ menu_about (GtkWidget * wid, gpointer sess) 666, get_cpu_str()); #endif - gtk_widget_show (gnome_about_new ("X-Chat", VERSION, + gtk_widget_show (gnome_about_new ("X-Chat", PACKAGE_VERSION, "(C) 1998-2005 Peter Zelezny", author, buf, 0)); } @@ -115,7 +115,7 @@ menu_about (GtkWidget * wid, gpointer sess) gtk_container_add (GTK_CONTAINER (vbox), label); g_get_charset (&locale); (snprintf) (buf, sizeof (buf), - "XChat "VERSION"\n\n" + "XChat "PACKAGE_VERSION"\n\n" "%s\n\n" "%s\n" "Charset: %s " src/fe-gtk/about.c @@ -136,13 +136,13 @@ fe_args (int argc, char *argv[]) GOptionContext *context; #ifdef ENABLE_NLS - bindtextdomain (PACKAGE, LOCALEDIR); - bind_textdomain_codeset (PACKAGE, "UTF-8"); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); #endif context = g_option_context_new (NULL); - g_option_context_add_main_entries (context, gopt_entries, PACKAGE); + g_option_context_add_main_entries (context, gopt_entries, GETTEXT_PACKAGE); g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_parse (context, &argc, &argv, &error); @@ -157,7 +157,7 @@ fe_args (int argc, char *argv[]) if (arg_show_version) { - printf (PACKAGE" "VERSION"\n"); + printf (PACKAGE_NAME" "PACKAGE_VERSION"\n"); return 0; } src/fe-gtk/fe-gtk.c @@ -101,7 +101,7 @@ fe_new_window (struct session *sess, int focus) snprintf (buf, sizeof (buf), "\n" - " \017xchat \00310"VERSION"\n" + " \017xchat \00310"PACKAGE_VERSION"\n" " \017Running on \00310%s \017glib \00310%d.%d.%d\n" " \017This binary compiled \00310"__DATE__"\017\n", get_cpu_str(), @@ -393,7 +393,7 @@ fe_args (int argc, char *argv[]) { if (!strcasecmp (argv[1], "--version") || !strcasecmp (argv[1], "-v")) { - puts (VERSION); + puts (PACKAGE_VERSION); return 0; } } @@ -428,8 +428,9 @@ fe_main (void) new_ircwindow (NULL, NULL, SESS_SERVER, 0); #ifdef ENABLE_NLS - bindtextdomain (PACKAGE, PREFIX"/share/locale"); - textdomain (PACKAGE); + bindtextdomain (GETTEXT_PACKAGE, PREFIX"/share/locale"); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); #endif while (!done) src/fe-text/fe-text.c 5fc4e52f3d2320e094bb6f6ce1a91dc037d6f13d zed zed http://github.com/tycho/xchat-aqua/commit/fac488e87dd62ae156a1da66929df3ea601b69d4 fac488e87dd62ae156a1da66929df3ea601b69d4

2006-05-22T07:47:10-07:00

* Update Automake & Autoconf macros (Brian Pepple). * plugin.c: don't calc the hash twice. remove useless memset. * plugin20.html: Add warnings about xchat_emit_print. 13ffedc3ca26a4f4dc961d3775b96416b6fca231 zed zed