Mercurial > pidgin

changeset 3662:4fcd36091737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 3791] Anybody else hate this? WARNING: Using auxiliary files such as `acconfig.h', `config.h.bot' WARNING: and `config.h.top', to define templates for `config.h.in' WARNING: is deprecated and discouraged. WARNING: Using the third argument of `AC_DEFINE' and WARNING: `AC_DEFINE_UNQUOTED' allows to define a template without WARNING: `acconfig.h': WARNING: AC_DEFINE([NEED_MAIN], 1, WARNING: [Define if a function `main' is needed.]) WARNING: More sophisticated templates can also be produced, see the WARNING: documentation. It's gone! committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 13 Oct 2002 08:30:18 +0000
parents de4c62f656ee
children de747789934f
files acconfig.h configure.ac configure.in
diffstat 3 files changed, 68 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
--- a/acconfig.h	Sun Oct 13 08:04:47 2002 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#undef ENABLE_NLS
-#undef HAVE_CATGETS
-#undef HAVE_GETTEXT
-#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-#undef HAVE_LIBSM
-#undef USE_APPLET
-#undef USE_GNOME
-#undef USE_PIXBUF
-#undef USE_SCREENSAVER
-#undef NO_MULTI
-#undef DEBUG
-
-#ifndef GAIM_PLUGINS
-# undef GAIM_PLUGINS
-#endif
-
-#undef USE_PERL
-#undef NAS_SOUND
-#undef ESD_SOUND
-#undef ARTSC_SOUND
-#undef _REENTRANT
-#undef NEED_GNOMESUPPORT_H
-#undef ZEPHYR_INT32
-#undef ZEPHYR_USES_KERBEROS
-#ifndef STATIC_PROTO_INIT
-#undef STATIC_PROTO_INIT
-#endif
-#undef socklen_t
-#undef HAVE_TM_GMTOFF
--- a/configure.ac	Sun Oct 13 08:04:47 2002 +0000
+++ b/configure.ac	Sun Oct 13 08:30:18 2002 +0000
@@ -47,18 +47,26 @@
 
 dnl Check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-socklen_t x;
-], [], [AC_MSG_RESULT(yes)], [
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-int accept(int, struct sockaddr *, size_t *);
-], [], [
-AC_MSG_RESULT(size_t)
-AC_DEFINE(socklen_t, size_t)], [
-AC_MSG_RESULT(int)
-AC_DEFINE(socklen_t, int)])])
+AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	socklen_t x;
+], [],
+[
+	AC_MSG_RESULT(yes)
+], [
+	AC_TRY_COMPILE([
+		#include <sys/types.h>
+		#include <sys/socket.h>
+		int accept(int, struct sockaddr *, size_t *);
+	], [], [
+		AC_MSG_RESULT(size_t)
+		AC_DEFINE(socklen_t, size_t, [socklen_t size])
+	], [
+		AC_MSG_RESULT(int)
+		AC_DEFINE(socklen_t, int, [socklen_t size])
+	])
+])
 
 dnl This is a bad, bad hack.  I am a bad, bad man.
 CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
@@ -102,7 +110,8 @@
 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
 AC_SUBST(STATIC_LINK_LIBS)
-AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto })
+AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto },
+	[Loads static protocol plugin module initialization functions.])
 
 AC_ARG_ENABLE(esd,     [  --disable-esd           Turn off ESD (default=auto)],,enable_esd=yes)
 AC_ARG_ENABLE(nas,     [  --enable-nas            Enable NAS (Network Audio System) support],,enable_nas=no)
@@ -117,7 +126,7 @@
 
 if test "$enable_debug" = yes ; then
 	CFLAGS="$CFLAGS -Wall -g3"
-	AC_DEFINE(DEBUG)
+	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
 AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([
@@ -145,7 +154,7 @@
 		AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>
 				],[],[enable_xss=no],[
-				AC_DEFINE(USE_SCREENSAVER)
+				AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
 				])
 	else
 	       XSS_LIBS=""
@@ -166,7 +175,7 @@
 #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
   ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
 if test "$ac_cv_struct_tm_gmtoff" = yes; then
-  AC_DEFINE(HAVE_TM_GMTOFF)
+  AC_DEFINE(HAVE_TM_GMTOFF, 1, [tm_gmtoff is available.])
 fi
 ])
 
@@ -197,13 +206,13 @@
 		AC_MSG_RESULT(ok)
 		AC_SUBST(PERL_CFLAGS)
 		AC_SUBST(PERL_LIBS)
-		AC_DEFINE(USE_PERL)
+		AC_DEFINE(USE_PERL, 1, [Define if Perl is enabled.])
 		AC_CHECK_FUNCS(Perl_eval_pv)
 	fi
 fi
 
 if test "$enable_nas" = yes ; then
-	AC_DEFINE(NAS_SOUND)
+	AC_DEFINE(NAS_SOUND, 1, [Define if we have NAS sound support.])
         SOUND_LIBS="-laudio -lXt"
 fi
 if test "$enable_esd" = yes ; then
@@ -213,7 +222,7 @@
         	CFLAGS="$CFLAGS $ESD_CFLAGS"
 		AC_TRY_COMPILE(,[#include <esd.h>],
 			[
-				AC_DEFINE(ESD_SOUND)
+				AC_DEFINE(ESD_SOUND, 1, [Define if we have ESD sound support.])
 				SOUND_LIBS="$SOUND_LIBS $ESD_LIBS"
 			],[
 				enable_esd=no
@@ -230,7 +239,7 @@
 		CFLAGS="$CFLAGS $ARTSC_CFLAGS"
 		AC_TRY_COMPILE(,[#include <artsc.h>],
 			[
-				AC_DEFINE(ARTSC_SOUND)
+				AC_DEFINE(ARTSC_SOUND, 1, [Define if we have artsc sound support.])
 				SOUND_LIBS="$SOUND_LIBS $ARTSC_LIBS"
 			],[
 				enable_artsc=no
@@ -245,7 +254,7 @@
 if test "$ac_cv_cygwin" = yes ; then
 	LDADD="$LDADD -static"
 	CFLAGS="$CFLAGS -Wall -g"
-	AC_DEFINE(DEBUG)
+	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi                           
 
 AC_SUBST(CFLAGS)
@@ -253,12 +262,12 @@
 AC_SUBST(LIBS)
 
 if test "x$enable_multi" != "xyes" ; then
-	AC_DEFINE(NO_MULTI)
+	AC_DEFINE(NO_MULTI, 1, [Define if multiple connections is disabled.])
 	enable_multi=no
 fi
 
 if test "x$enable_plugins" = "xyes" ; then
-	AC_DEFINE(GAIM_PLUGINS)
+	AC_DEFINE(GAIM_PLUGINS, 1, [Define if plugins are enabled.])
 	AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes")
 else
 	AM_CONDITIONAL(PLUGINS, false)
@@ -284,7 +293,7 @@
 AC_CHECK_LIB(nsl, gethostent)
 
 dnl checks for zephyr
-AC_DEFINE(ZEPHYR_INT32, long)
+AC_DEFINE(ZEPHYR_INT32, long, [Size of an int32.])
 AC_SUBST(KRB4_CFLAGS)
 AC_SUBST(KRB4_LDFLAGS)
 AC_SUBST(KRB4_LIBS)
@@ -300,7 +309,7 @@
 	elif test -d /usr/include/kerberosIV ; then
 		KRB4_CFLAGS="-I/usr/include/kerberosIV"
 	fi
-	AC_DEFINE(ZEPHYR_USES_KERBEROS)
+	AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
 
 	orig_LDFLAGS="$LDFLAGS"
 	LDFLAGS="$LDFLAGS $KRB4_LDFLAGS"
--- a/configure.in	Sun Oct 13 08:04:47 2002 +0000
+++ b/configure.in	Sun Oct 13 08:30:18 2002 +0000
@@ -46,18 +46,26 @@
 
 dnl Check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-socklen_t x;
-], [], [AC_MSG_RESULT(yes)], [
-AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>
-int accept(int, struct sockaddr *, size_t *);
-], [], [
-AC_MSG_RESULT(size_t)
-AC_DEFINE(socklen_t, size_t)], [
-AC_MSG_RESULT(int)
-AC_DEFINE(socklen_t, int)])])
+AC_TRY_COMPILE([
+	#include <sys/types.h>
+	#include <sys/socket.h>
+	socklen_t x;
+], [],
+[
+	AC_MSG_RESULT(yes)
+], [
+	AC_TRY_COMPILE([
+		#include <sys/types.h>
+		#include <sys/socket.h>
+		int accept(int, struct sockaddr *, size_t *);
+	], [], [
+		AC_MSG_RESULT(size_t)
+		AC_DEFINE(socklen_t, size_t, [socklen_t size])
+	], [
+		AC_MSG_RESULT(int)
+		AC_DEFINE(socklen_t, int, [socklen_t size])
+	])
+])
 
 dnl This is a bad, bad hack.  I am a bad, bad man.
 CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
@@ -101,7 +109,8 @@
 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
 AC_SUBST(STATIC_LINK_LIBS)
-AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto })
+AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto },
+	[Loads static protocol plugin module initialization functions.])
 
 AC_ARG_ENABLE(esd,     [  --disable-esd           Turn off ESD (default=auto)],,enable_esd=yes)
 AC_ARG_ENABLE(nas,     [  --enable-nas            Enable NAS (Network Audio System) support],,enable_nas=no)
@@ -116,7 +125,7 @@
 
 if test "$enable_debug" = yes ; then
 	CFLAGS="$CFLAGS -Wall -g3"
-	AC_DEFINE(DEBUG)
+	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi
 
 
@@ -145,7 +154,7 @@
 		AC_TRY_COMPILE([
 #include <X11/extensions/scrnsaver.h>
 				],[],[enable_xss=no],[
-				AC_DEFINE(USE_SCREENSAVER)
+				AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
 				])
 	else
 	       XSS_LIBS=""
@@ -165,7 +174,7 @@
 #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
   ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
 if test "$ac_cv_struct_tm_gmtoff" = yes; then
-  AC_DEFINE(HAVE_TM_GMTOFF)
+  AC_DEFINE(HAVE_TM_GMTOFF, 1, [tm_gmtoff is available.])
 fi
 ])
 
@@ -195,13 +204,13 @@
 		AC_MSG_RESULT(ok)
 		AC_SUBST(PERL_CFLAGS)
 		AC_SUBST(PERL_LIBS)
-		AC_DEFINE(USE_PERL)
+		AC_DEFINE(USE_PERL, 1, [Define if Perl is enabled.])
 		AC_CHECK_FUNCS(Perl_eval_pv)
 	fi
 fi
 
 if test "$enable_nas" = yes ; then
-	AC_DEFINE(NAS_SOUND)
+	AC_DEFINE(NAS_SOUND, 1, [Define if we have NAS sound support.])
         SOUND_LIBS="-laudio -lXt"
 fi
 if test "$enable_esd" = yes ; then
@@ -211,7 +220,7 @@
         	CFLAGS="$CFLAGS $ESD_CFLAGS"
 		AC_TRY_COMPILE(,[#include <esd.h>],
 			[
-				AC_DEFINE(ESD_SOUND)
+				AC_DEFINE(ESD_SOUND, 1, [Define if we have ESD sound support.])
 				SOUND_LIBS="$SOUND_LIBS $ESD_LIBS"
 			],[
 				enable_esd=no
@@ -228,7 +237,7 @@
 		CFLAGS="$CFLAGS $ARTSC_CFLAGS"
 		AC_TRY_COMPILE(,[#include <artsc.h>],
 			[
-				AC_DEFINE(ARTSC_SOUND)
+				AC_DEFINE(ARTSC_SOUND, 1, [Define if we have artsc sound support.])
 				SOUND_LIBS="$SOUND_LIBS $ARTSC_LIBS"
 			],[
 				enable_artsc=no
@@ -243,7 +252,7 @@
 if test "$ac_cv_cygwin" = yes ; then
 	LDADD="$LDADD -static"
 	CFLAGS="$CFLAGS -Wall -g"
-	AC_DEFINE(DEBUG)
+	AC_DEFINE(DEBUG, 1, [Define if debugging is enabled.])
 fi                           
 
 AC_SUBST(CFLAGS)
@@ -251,12 +260,12 @@
 AC_SUBST(LIBS)
 
 if test "x$enable_multi" != "xyes" ; then
-	AC_DEFINE(NO_MULTI)
+	AC_DEFINE(NO_MULTI, 1, [Define if multiple connections is disabled.])
 	enable_multi=no
 fi
 
 if test "x$enable_plugins" = "xyes" ; then
-	AC_DEFINE(GAIM_PLUGINS)
+	AC_DEFINE(GAIM_PLUGINS, 1, [Define if plugins are enabled.])
 	AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes")
 else
 	AM_CONDITIONAL(PLUGINS, false)
@@ -282,7 +291,7 @@
 AC_CHECK_LIB(nsl, gethostent)
 
 dnl checks for zephyr
-AC_DEFINE(ZEPHYR_INT32, long)
+AC_DEFINE(ZEPHYR_INT32, long, [Size of an int32.])
 AC_SUBST(KRB4_CFLAGS)
 AC_SUBST(KRB4_LDFLAGS)
 AC_SUBST(KRB4_LIBS)
@@ -298,7 +307,7 @@
 	elif test -d /usr/include/kerberosIV ; then
 		KRB4_CFLAGS="-I/usr/include/kerberosIV"
 	fi
-	AC_DEFINE(ZEPHYR_USES_KERBEROS)
+	AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.])
 
 	orig_LDFLAGS="$LDFLAGS"
 	LDFLAGS="$LDFLAGS $KRB4_LDFLAGS"