← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xchat-gnome/trusty-updates

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-07-05 12:27:58 UTC
  • mfrom: (1.1.19 upstream) (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110705122758-bkl6xii0ebfddtmh
Tags: 1:0.30.0~git20100421.29cc76-1ubuntu1
https://launchpad.net/bugs/773847
https://launchpad.net/bugs/374686
* Merge with Debian unstable, remaining changes: (LP: #773847)
  - debian/control:
    - add Build-Depends on liblaunchpad-integration-dev.
    - xchat-gnome Suggests: xchat-gnome-indicator.
  - debian/patches/02_lpi.patch: add Launchpad integration items to the help
    menu
  - debian/patches/10_xchat-gnome-close-event.patch: add events for window
    close.
  - debian/patches/04_autojoin_ubuntu_chan.patch: add the Ubuntu network
    as default selection and default to autojoining #ubuntu.
  - debian/patches/20_add_gui_focus.patch: implement GUI focus from XChat.
  - debian/patches/51_freenode_default_port_8001.patch: Drop ports 666x
    for FreeNode to workaround a possible DCC exploit.
  - debian/patches/95_apturl-support.patch: support apt://-urls.
  - debian/watch: also look for unstable versions
  - debian/xchat-gnome.gconf-defaults: Set the default enabled plugins,
    indicator, netmonitor, and notifyosd.
* debian/patches/52_no_zero_width_pixmaps.patch: dropped, applied upstream.
* debian/patches/98_ice_depends_for_eggsmclient.patch: replaced by
  01_link_libice.patch.
* debian/control: remove duplicate entry in Build-Depends for intltool.
* debian/xchat-gnome.install: also install the xchat-gnome.desktop file from
  /usr/share/applications in xchat-gnome rather than xchat-gnome-common.
  (LP: #374686)
* debian/rules: update the xchat-gnome-common binary-install target to not
  keep a duplicate copy of the xchat-gnome.desktop file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
AC_INIT([XChat-GNOME IRC Chat],[0.26.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=xchat-gnome],[xchat-gnome])
 
1
AC_INIT([XChat-GNOME IRC Chat],[0.3.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=xchat-gnome],[xchat-gnome])
2
2
 
3
3
AC_PREREQ([2.60])
4
4
 
6
6
AC_CONFIG_HEADERS([config.h])
7
7
AC_CONFIG_SRCDIR([configure.ac])
8
8
 
9
 
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip subdir-objects])
 
9
AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip subdir-objects])
10
10
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
11
11
 
12
12
if test "$enable_maintainer_mode" = "yes"; then
19
19
fi
20
20
AM_MAINTAINER_MODE([enable])
21
21
 
22
 
IT_PROG_INTLTOOL([0.35.0])
23
 
 
24
22
GLIB_REQUIRED=2.18.0
25
 
GTK_REQUIRED=2.14.0
26
 
LIBGLADE_REQUIRED=2.3.2
 
23
GTK_REQUIRED=2.24.0
27
24
GCONF_REQUIRED=2.8.0
28
25
DBUS_REQUIRED=0.60
29
26
DBUS_GLIB_REQUIRED=0.60
32
29
LIBCANBERRAGTK_REQUIRED=0.3
33
30
SM_REQUIRED=1.0.0
34
31
 
 
32
# Check for programs
35
33
AC_PROG_CC
36
34
AM_PROG_CC_C_O
37
35
AC_PROG_CC_C99
38
36
AC_PROG_CPP
39
37
AM_PROG_AS
40
 
AC_PROG_LIBTOOL
41
 
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
42
 
 
 
38
 
 
39
#Initialize libtool
 
40
LT_PREREQ([2.2])
 
41
LT_INIT
 
42
 
 
43
# Checks for typedefs, structures, and compiler characteristics.
43
44
AC_C_CONST
44
45
AC_TYPE_SIZE_T
45
 
AC_EXEEXT
46
 
AC_HEADER_STDC
47
46
 
 
47
# Checks for library functions.
48
48
AC_CHECK_FUNCS(snprintf vsnprintf)
49
49
AC_CHECK_FUNCS(memrchr strtoull atoll)
50
50
 
51
 
GNOME_COMMON_INIT
 
51
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 
52
 
52
53
GNOME_MAINTAINER_MODE_DEFINES
53
54
GNOME_DEBUG_CHECK
54
55
GNOME_COMPILE_WARNINGS([maximum])
64
65
                  gio-2.0 >= $GLIB_REQUIRED \
65
66
                  gtk+-2.0 >= $GTK_REQUIRED \
66
67
                  launchpad-integration \
67
 
                  libglade-2.0 >= $LIBGLADE_REQUIRED \
68
68
                  gconf-2.0 >= $GCONF_REQUIRED \
69
69
                  libsexy >= $LIBSEXY_REQUIRED \
70
70
                  ])
75
75
                  sm >= $SM_REQUIRED \
76
76
                  ice \
77
77
                  ])
78
 
AC_SUBST(EGG_SMCLIENT_CFLAGS)
79
 
AC_SUBST(EGG_SMCLIENT_LIBS)
80
78
 
81
79
#D-Bus
82
80
AC_MSG_CHECKING([whether D-Bus support is requested])
96
94
        if test "x$dbus" = "xno"; then
97
95
                AC_MSG_WARN([Library requirements (dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gthread-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
98
96
        fi
99
 
        AC_SUBST([DBUS_CFLAGS])
100
 
        AC_SUBST([DBUS_LIBS])
101
97
        AC_PATH_PROG([DBUS_BINDING_TOOL],[dbus-binding-tool],[no])
102
98
        if test "x$DBUS_BINDING_TOOL" = "xno"; then
103
99
                dbus="no"
130
126
 
131
127
if test "$enable_notification" = "yes"; then
132
128
  PKG_CHECK_MODULES([LIBNOTIFY],[libnotify >= $LIBNOTIFY_REQUIRED])
133
 
  AC_SUBST([LIBNOTIFY_CFLAGS])
134
 
  AC_SUBST([LIBNOTIFY_LIBS])
135
129
fi
136
130
 
137
131
AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$enable_notification" = "xyes"])
145
139
 
146
140
if test "$enable_canberra" = "yes"; then
147
141
  PKG_CHECK_MODULES([LIBCANBERRAGTK],[libcanberra-gtk >= $LIBCANBERRAGTK_REQUIRED])
148
 
  AC_SUBST([LIBCANBERRAGTK_CFLAGS])
149
 
  AC_SUBST([LIBCANBERRAGTK_LIBS])
150
142
fi
151
143
 
152
144
AM_CONDITIONAL([ENABLE_LIBCANBERRA],[test "x$enable_canberra" = "xyes"])
295
287
# openssl
296
288
PKG_CHECK_MODULES([OPENSSL], [openssl], openssl=yes, openssl=no)
297
289
if test "x$openssl" = xyes; then
298
 
        AC_SUBST([OPENSSL_CFLAGS])
299
 
        AC_SUBST([OPENSSL_LIBS])
300
290
        AC_DEFINE(USE_OPENSSL, [], [Whether to use OpenSSL])
301
291
else
302
292
        AC_MSG_WARN([Library requirements (openssl) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
304
294
AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
305
295
 
306
296
# i18n
 
297
IT_PROG_INTLTOOL([0.40.0])
 
298
 
 
299
AM_GNU_GETTEXT_VERSION([0.17])
 
300
AM_GNU_GETTEXT([external])
 
301
 
307
302
GETTEXT_PACKAGE=xchat-gnome
308
303
AC_SUBST([GETTEXT_PACKAGE])
309
304
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
310
 
AM_GLIB_GNU_GETTEXT
311
305
 
312
306
# ipv6
313
307
AC_CHECK_LIB(socket, select)