comparison configure.ac @ 1005:2346d918470d trunk

[svn] Fixed rootvis' config to only declare stuff once; modified alarm.c to use dbus and made appropriate changes to the build system.
author magma
date Wed, 09 May 2007 14:38:09 -0700
parents 8825a00d57d7
children 0e4ee1c4e6cb
comparison
equal deleted inserted replaced
1004:be2d04b2bd28 1005:2346d918470d
105 PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 1.2.99], 105 PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 1.2.99],
106 [ADD_PC_REQUIRES([audacious >= 1.2.99])], 106 [ADD_PC_REQUIRES([audacious >= 1.2.99])],
107 [AC_MSG_ERROR([Cannot find Audacious, have you installed audacious yet?])] 107 [AC_MSG_ERROR([Cannot find Audacious, have you installed audacious yet?])]
108 ) 108 )
109 109
110 dnl Check for GTK/GLib/GThread/Pango 110 dnl Check for GTK/GLib/GThread/Pango/DBus
111 111
112 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0 gthread-2.0], 112 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0 gthread-2.0],
113 [ADD_PC_REQUIRES([glib-2.0 >= 2.6.0])], 113 [ADD_PC_REQUIRES([glib-2.0 >= 2.6.0])],
114 [AC_MSG_ERROR([Cannot find glib2 >= 2.6.0])] 114 [AC_MSG_ERROR([Cannot find glib2 >= 2.6.0])]
115 ) 115 )
121 121
122 PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0], 122 PKG_CHECK_MODULES(PANGO, [pango >= 1.8.0],
123 [ADD_PC_REQUIRES([pango >= 1.8.0])], 123 [ADD_PC_REQUIRES([pango >= 1.8.0])],
124 [AC_MSG_ERROR([Cannot find pango >= 1.8.0])] 124 [AC_MSG_ERROR([Cannot find pango >= 1.8.0])]
125 ) 125 )
126
127 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60],
128 [ADD_PC_REQUIRES([dbus-1 >= 0.60 dbus-glib-1 >= 0.60])
129 AC_DEFINE(USE_DBUS, 1, [Define if D-Bus support enabled])],
130 [AC_MSG_ERROR([Cannot find dbus-glib >= 0.60])]
131 ])
126 132
127 dnl IPv6 support 133 dnl IPv6 support
128 dnl ======================== 134 dnl ========================
129 AC_ARG_ENABLE(ipv6, 135 AC_ARG_ENABLE(ipv6,
130 [ --enable-ipv6 enable IPv6 support (default=no)], 136 [ --enable-ipv6 enable IPv6 support (default=no)],
1013 1019
1014 1020
1015 AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes") 1021 AM_CONDITIONAL(HAVE_CDROM, test "${ac_cv_header_linux_cdrom_h}" = "yes" || test "${ac_cv_header_sys_cdio_h}" = "yes")
1016 AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes") 1022 AM_CONDITIONAL(HAVE_LINUX_JOYSTICK,test "${ac_cv_header_linux_joystick_h}" = "yes")
1017 1023
1018 CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS" 1024 CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
1019 CXXFLAGS="$CXXFLAGS $AUDACIOUS_CFLAGS" 1025 CXXFLAGS="$CXXFLAGS $AUDACIOUS_CFLAGS $DBUS_CFLAGS"
1020 1026
1021 AC_MSG_CHECKING(if __ELF__ is defined) 1027 AC_MSG_CHECKING(if __ELF__ is defined)
1022 AC_EGREP_CPP(yes, 1028 AC_EGREP_CPP(yes,
1023 [#ifdef __ELF__ 1029 [#ifdef __ELF__
1024 yes 1030 yes