1
diff -Nur orbit2-2.14.9/aclocal.m4 orbit2-2.14.9.new/aclocal.m4
2
--- orbit2-2.14.9/aclocal.m4 2007-09-17 11:47:24.000000000 +0200
3
+++ orbit2-2.14.9.new/aclocal.m4 2007-09-17 16:52:07.000000000 +0200
5
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
6
AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
7
dnl for overriding the documentation installation directory
8
- AC_ARG_WITH(html-dir,
9
- AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
10
+ AC_ARG_WITH([html-dir],
11
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
12
[with_html_dir='${datadir}/gtk-doc/html'])
13
HTML_DIR="$with_html_dir"
15
+ AC_SUBST([HTML_DIR])
17
dnl enable/disable documentation building
18
- AC_ARG_ENABLE(gtk-doc,
19
- AC_HELP_STRING([--enable-gtk-doc],
20
- [use gtk-doc to build documentation [default=no]]),,
22
+ AC_ARG_ENABLE([gtk-doc],
23
+ AS_HELP_STRING([--enable-gtk-doc],
24
+ [use gtk-doc to build documentation [[default=no]]]),,
25
+ [enable_gtk_doc=no])
28
if test x$enable_gtk_doc = xyes; then
29
if test -z "$PKG_CONFIG"; then
30
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
31
+ AC_PATH_PROG([PKG_CONFIG], [pkg-config], [no])
33
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
36
if test "$have_gtk_doc" = yes; then
37
AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
38
if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
40
+ AC_MSG_RESULT([yes])
51
- AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
52
- AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
53
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
54
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
1
diff -Nur orbit2-2.14.11/aclocal.m4 orbit2-2.14.11.new/aclocal.m4
2
--- orbit2-2.14.11/aclocal.m4 2008-01-25 11:36:49.000000000 +0100
3
+++ orbit2-2.14.11.new/aclocal.m4 2008-01-25 12:37:04.000000000 +0100
57
6
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
59
8
-# serial 51 AC_PROG_LIBTOOL
60
+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
9
+# serial 51 Debian 1.5.24-2ubuntu2 AC_PROG_LIBTOOL
63
12
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
164
113
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
165
114
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
167
diff -Nur orbit2-2.14.9/config.h.in~ orbit2-2.14.9.new/config.h.in~
168
--- orbit2-2.14.9/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
169
+++ orbit2-2.14.9.new/config.h.in~ 2007-09-17 11:58:50.000000000 +0200
171
+/* config.h.in. Generated from configure.in by autoheader. */
173
+/* Define if HTTP connections are available */
176
+/* Define to 1 if you have the <arpa/inet.h> header file. */
177
+#undef HAVE_ARPA_INET_H
179
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
180
+#undef HAVE_ARPA_NAMESER_H
182
+/* Define to 1 if you have the `basename' function. */
183
+#undef HAVE_BASENAME
185
+/* Define to 1 if you have the <dlfcn.h> header file. */
188
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
191
+/* Define to 1 if you have the <endian.h> header file. */
192
+#undef HAVE_ENDIAN_H
194
+/* Define to 1 if you have the <fcntl.h> header file. */
197
+/* Define if getaddrinfo() is available */
198
+#undef HAVE_GETADDRINFO
200
+/* Define if getnameinfo() is available */
201
+#undef HAVE_GETNAMEINFO
203
+/* Define if inet_pton() is available */
204
+#undef HAVE_INET_PTON
206
+/* Define to 1 if you have the <inttypes.h> header file. */
207
+#undef HAVE_INTTYPES_H
209
+/* Define to 1 if you have the `nsl' library (-lnsl). */
212
+/* Define to 1 if you have the `resolv' library (-lresolv). */
213
+#undef HAVE_LIBRESOLV
215
+/* Define to 1 if you have the `socket' library (-lsocket). */
216
+#undef HAVE_LIBSOCKET
218
+/* Define to 1 if you have the <linux/socket.h> header file. */
219
+#undef HAVE_LINUX_SOCKET_H
221
+/* Define to 1 if you have the <machine/endian.h> header file. */
222
+#undef HAVE_MACHINE_ENDIAN_H
224
+/* Define to 1 if you have the <machine/types.h> header file. */
225
+#undef HAVE_MACHINE_TYPES_H
227
+/* Define to 1 if you have the <memory.h> header file. */
228
+#undef HAVE_MEMORY_H
230
+/* Define to 1 if you have the <netdb.h> header file. */
233
+/* Define to 1 if you have the <netinet/in.h> header file. */
234
+#undef HAVE_NETINET_IN_H
236
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
237
+#undef HAVE_NETINET_TCP_H
239
+/* Define to 1 if you have the `poll' function. */
242
+/* Define to 1 if you have the <resolv.h> header file. */
243
+#undef HAVE_RESOLV_H
245
+/* Define if sockaddr has sa_len member */
246
+#undef HAVE_SOCKADDR_SA_LEN
248
+/* Define to 1 if you have the <stddef.h> header file. */
249
+#undef HAVE_STDDEF_H
251
+/* Define to 1 if you have the <stdint.h> header file. */
252
+#undef HAVE_STDINT_H
254
+/* Define to 1 if you have the <stdlib.h> header file. */
255
+#undef HAVE_STDLIB_H
257
+/* Define to 1 if you have the <strings.h> header file. */
258
+#undef HAVE_STRINGS_H
260
+/* Define to 1 if you have the <string.h> header file. */
261
+#undef HAVE_STRING_H
263
+/* Define to 1 if you have the <syslog.h> header file. */
264
+#undef HAVE_SYSLOG_H
266
+/* Define to 1 if you have the <sys/endian.h> header file. */
267
+#undef HAVE_SYS_ENDIAN_H
269
+/* Define to 1 if you have the <sys/isa_defs.h> header file. */
270
+#undef HAVE_SYS_ISA_DEFS_H
272
+/* Define to 1 if you have the <sys/machine.h> header file. */
273
+#undef HAVE_SYS_MACHINE_H
275
+/* Define to 1 if you have the <sys/poll.h> header file. */
276
+#undef HAVE_SYS_POLL_H
278
+/* Define to 1 if you have the <sys/select.h> header file. */
279
+#undef HAVE_SYS_SELECT_H
281
+/* Define to 1 if you have the <sys/socket.h> header file. */
282
+#undef HAVE_SYS_SOCKET_H
284
+/* Define to 1 if you have the <sys/sockio.h> header file. */
285
+#undef HAVE_SYS_SOCKIO_H
287
+/* Define to 1 if you have the <sys/stat.h> header file. */
288
+#undef HAVE_SYS_STAT_H
290
+/* Define to 1 if you have the <sys/time.h> header file. */
291
+#undef HAVE_SYS_TIME_H
293
+/* Define to 1 if you have the <sys/types.h> header file. */
294
+#undef HAVE_SYS_TYPES_H
296
+/* Define to 1 if you have the <sys/uio.h> header file. */
297
+#undef HAVE_SYS_UIO_H
299
+/* Define to 1 if you have the <sys/un.h> header file. */
300
+#undef HAVE_SYS_UN_H
302
+/* Define to 1 if you have the <sys/utime.h> header file. */
303
+#undef HAVE_SYS_UTIME_H
305
+/* Define to 1 if you have the <sys/wait.h> header file. */
306
+#undef HAVE_SYS_WAIT_H
308
+/* Define to 1 if you have the <unistd.h> header file. */
309
+#undef HAVE_UNISTD_H
311
+/* Define to 1 if you have the <utime.h> header file. */
314
+/* Define to 1 if you have the `vprintf' function. */
317
+/* Define to 1 if you have the <wchar.h> header file. */
320
+/* Define to 1 if you have the <wcstr.h> header file. */
323
+/* Define to 1 if you have the <wctype.h> header file. */
324
+#undef HAVE_WCTYPE_H
326
+/* Define to 1 if you have the <winsock2.h> header file. */
327
+#undef HAVE_WINSOCK2_H
329
+/* defined if purify is enabled */
332
+/* Define to the address where bug reports for this package should be sent. */
333
+#undef PACKAGE_BUGREPORT
335
+/* Define to the full name of this package. */
338
+/* Define to the full name and version of this package. */
339
+#undef PACKAGE_STRING
341
+/* Define to the one symbol short name of this package. */
342
+#undef PACKAGE_TARNAME
344
+/* Define to the version of this package. */
345
+#undef PACKAGE_VERSION
347
+/* Define to 1 if you have the ANSI C header files. */
350
+/* Define to 1 if your processor stores words with the most significant byte
351
+ first (like Motorola and SPARC, unlike Intel and VAX). */
352
+#undef WORDS_BIGENDIAN
354
+/* Define to empty if `const' does not conform to ANSI C. */
357
+/* Define to `__inline__' or `__inline' if that's what the C compiler
358
+ calls it, or to nothing if 'inline' is not supported under any name. */
363
+/* Define to `unsigned int' if <sys/types.h> does not define. */
366
+/* Define socklen_t to be of type size_t */
368
diff -Nur orbit2-2.14.9/configure orbit2-2.14.9.new/configure
369
--- orbit2-2.14.9/configure 2007-09-17 11:47:28.000000000 +0200
370
+++ orbit2-2.14.9.new/configure 2007-09-17 16:52:12.000000000 +0200
371
@@ -1541,7 +1541,7 @@
372
--enable-compile-warnings=no/yes Turn on compiler warnings.
373
--enable-debug=no/yes turn on debugging default=no
374
--enable-purify be clean for memory debuggers
375
- --enable-gtk-doc use gtk-doc to build documentation default=no
376
+ --enable-gtk-doc use gtk-doc to build documentation [default=no]
379
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
116
diff -Nur orbit2-2.14.11/configure orbit2-2.14.11.new/configure
117
--- orbit2-2.14.11/configure 2008-01-25 11:36:52.000000000 +0100
118
+++ orbit2-2.14.11.new/configure 2008-01-25 12:37:08.000000000 +0100
380
119
@@ -4428,7 +4428,7 @@
381
120
lt_cv_deplibs_check_method=pass_all