comparison configure.ac @ 3411:5df423e0bca8

[gaim-migrate @ 3430] This hopefully adds automake 1.6 support to gaim. I have not tested it, though it came from a guy who uses 1.6, so I'd hope it works. It doesn't break 1.4. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 18 Aug 2002 19:32:05 +0000
parents ba6d0856c8e4
children 59589bb7ce1e
comparison
equal deleted inserted replaced
3410:3fd9f8e2c463 3411:5df423e0bca8
149 enable_gnome=no 149 enable_gnome=no
150 enable_pixbuf=no 150 enable_pixbuf=no
151 fi 151 fi
152 fi 152 fi
153 fi 153 fi
154
155 GNOME_INIT_HOOK([], nofail, applets)
154 156
155 if test "x$enable_gnome" = "xyes" ; then 157 if test "x$enable_gnome" = "xyes" ; then
156 if test "x$enable_panel" = "xyes" ; then 158 if test "x$enable_panel" = "xyes" ; then
157 GNOME_INIT(applets)
158 GNOME_X_CHECKS 159 GNOME_X_CHECKS
159 CFLAGS="$CFLAGS $GNOME_INCLUDEDIR" 160 CFLAGS="$CFLAGS $GNOME_INCLUDEDIR"
160 AC_DEFINE(USE_APPLET) 161 AC_DEFINE(USE_APPLET)
161 AC_DEFINE(USE_GNOME) 162 AC_DEFINE(USE_GNOME)
162 UI_LIBS="$UI_LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS" 163 UI_LIBS="$UI_LIBS $GTK_LIBS $GNOME_LIBDIR $GNOME_APPLETS_LIBS $GNOMEUI_LIBS"
359 360
360 if test "x$enable_plugins" = "xyes" ; then 361 if test "x$enable_plugins" = "xyes" ; then
361 AC_DEFINE(GAIM_PLUGINS) 362 AC_DEFINE(GAIM_PLUGINS)
362 AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes") 363 AM_CONDITIONAL(PLUGINS, test "x$enable_plugins" = "xyes")
363 else 364 else
365 AM_CONDITIONAL(PLUGINS, false)
364 enable_plugins=no 366 enable_plugins=no
365 enable_prpls=no 367 enable_prpls=no
366 fi 368 fi
367 369
368 if test "x$enable_prpls" = "xyes" ; then 370 if test "x$enable_prpls" = "xyes" ; then
369 AM_CONDITIONAL(PRPLS, test "x$enable_plugins" = "xyes") 371 AM_CONDITIONAL(PRPLS, test "x$enable_plugins" = "xyes")
370 else 372 else
373 AM_CONDITIONAL(PRPLS, false)
371 enable_prpls=no 374 enable_prpls=no
372 fi 375 fi
373 376
374 dnl checks for icqlib 377 dnl checks for icqlib
375 AC_CHECK_HEADERS(asm/byteorder.h byteswap.h endian.h machine/endian.h arpa/nameser_compat.h) 378 AC_CHECK_HEADERS(asm/byteorder.h byteswap.h endian.h machine/endian.h arpa/nameser_compat.h)