[Gaim-commits] CVS: gaim configure.in,1.101,1.102 autogen.sh,1.13,1.14 configure.ac,1.57,1.58

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv5694

Modified Files:
	autogen.sh configure.ac 
Added Files:
	configure.in 
Log Message:
This is a dirty hack to attempt to maintain compatibility with autoconf 2.13
and 2.53.  We'll eventually get tired of it and drop 2.13 altogether.



Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- autogen.sh	19 Nov 2001 19:43:07 -0000	1.13
+++ autogen.sh	26 Apr 2002 00:59:30 -0000	1.14
@@ -29,9 +29,12 @@
 }
 
 # Thanks decklin
-if test ! -f configure.in ; then
+if test -f configure.ac ; then
 	if autoconf --version | grep '2\.[01]' > /dev/null 2>&1 ; then
-		ln -sf configure.ac configure.in
+		mv configure.ac configure.2.1x;
+		echo "configure.ac has been moved to configure.2.1x to retain compatibility with autoconf 2.1x"
+		echo "Future versions of Gaim will not support autoconf versions older than 2.50"
+
 	fi
 fi
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- configure.ac	24 Apr 2002 04:47:04 -0000	1.57
+++ configure.ac	26 Apr 2002 00:59:30 -0000	1.58
@@ -1,7 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(src/aim.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([gaim], [0.57-cvs])
+AM_INIT_AUTOMAKE([gaim], [0.57])
+
+AC_PREREQ([2.50])
 
 AC_PATH_PROG(sedpath, sed)
 
@@ -34,8 +36,10 @@
 AC_CHECK_FUNCS(socket strdup strstr atexit getaddrinfo)
 
 dnl Checks for getopt in standard library
-AC_CHECK_FUNCS(getopt_long , , [LIBOBJS="$LIBOBJS getopt.o getopt1.o"] ) 
-AC_SUBST(LIBOBJS)
+AC_CHECK_FUNCS(getopt_long , ,
+AC_LIBOBJ(getopt)
+AC_LIBOBJ(getopt1)) 
+ 
 
 dnl Check for inet_aton
 AC_CHECK_FUNC(inet_aton, , [AC_CHECK_LIB(resolv, inet_aton, , 
@@ -254,35 +258,6 @@
 	enable_xss=no
 fi
 AC_SUBST(XSS_LIBS)
-
-
-dnl Shamelessly stolen from gnome-pim
-dnl This determines, if struct tm containes tm_gmtoff field
-dnl or we should use extern long int timezone.
-dnl Actually this should go into acinclude.m4
-AC_DEFUN(GC_TIMEZONE,
-[AC_REQUIRE([AC_STRUCT_TM])dnl
-AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#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)
-else
-  AC_CACHE_CHECK(for timezone, ac_cv_var_timezone,
-[AC_TRY_LINK(
-changequote(<<, >>)dnl
-<<#include <time.h>
-extern long int timezone;>>,
-changequote([, ])dnl
-[long int l = timezone;], ac_cv_var_timezone=yes, ac_cv_var_timezone=no)])
-  if test $ac_cv_var_timezone = yes; then
-    AC_DEFINE(HAVE_TIMEZONE)
-  fi
-fi
-])
-
-GC_TIMEZONE