gaim-am_ac.patch

   1 --- gaim-0.56/src/protocols/gg/Makefile.am.wiget        Wed Apr 17 10:51:06 2002
   2 +++ gaim-0.56/src/protocols/gg/Makefile.am      Wed Apr 17 14:57:10 2002
   3 @@ -2,27 +2,24 @@
   4
   5  pkgdir = $(libdir)/gaim
   6
   7 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
   8 -libgg_la_LDFLAGS = -module -avoid-version
   9 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
  10 +
  11
  12  if STATIC_GG
  13
  14  st = -DSTATIC
  15  pkg_LTLIBRARIES =
  16 -noinst_LIBRARIES = libgg.a
  17 -
  18 -libgg_a_SOURCES = libgg.c \
  19 -                 libgg.h \
  20 -                 common.c \
  21 -                 iconv_string.c \
  22 -                 iconv_string.h \
  23 -                 gg.c
  24 +noinst_LTLIBRARIES = libgg-static.la
  25 +libgg_la_LDFLAGS =
  26
  27  else
  28
  29  st =
  30  pkg_LTLIBRARIES = libgg.la
  31 -noinst_LIBRARIES =
  32 +noinst_LTLIBRARIES =
  33 +libgg_la_LDFLAGS = -module -avoid-version
  34 +
  35 +endif
  36
  37  libgg_la_SOURCES = libgg.c \
  38                    libgg.h \
  39 @@ -30,5 +27,6 @@
  40                    iconv_string.c \
  41                    iconv_string.h \
  42                    gg.c
  43 +
  44 +libgg_static_la_SOURCES = $(libgg_la_SOURCES)
  45
  46 -endif
  47 --- gaim-0.56/src/protocols/irc/Makefile.am.wiget       Wed Apr 17 11:17:13 2002
  48 +++ gaim-0.56/src/protocols/irc/Makefile.am     Wed Apr 17 13:15:31 2002
  49 @@ -2,23 +2,24 @@
  50
  51  pkgdir = $(libdir)/gaim
  52
  53 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
  54 -libirc_la_LDFLAGS = -module -avoid-version
  55 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
  56
  57  if STATIC_IRC
  58
  59  st = -DSTATIC
  60  pkg_LTLIBRARIES =
  61 -noinst_LIBRARIES = libirc.a
  62 -
  63 -libirc_a_SOURCES = irc.c
  64 +noinst_LTLIBRARIES = libirc-static.la
  65 +libirc_la_LDFLAGS =
  66
  67  else
  68
  69  st =
  70  pkg_LTLIBRARIES = libirc.la
  71  noinst_LIBRARIES =
  72 +libirc_la_LDFLAGS = -module -avoid-version
  73 +
  74 +endif
  75
  76  libirc_la_SOURCES = irc.c
  77
  78 -endif
  79 +libirc_static_la_SOURCES = $(libirc_la_SOURCES)
  80 --- gaim-0.56/src/protocols/jabber/Makefile.am.wiget    Wed Apr 17 12:23:09 2002
  81 +++ gaim-0.56/src/protocols/jabber/Makefile.am  Wed Apr 17 13:15:21 2002
  82 @@ -2,62 +2,23 @@
  83
  84  pkgdir = $(libdir)/gaim
  85
  86 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
  87 -libjabber_la_LDFLAGS =         -module -avoid-version
  88 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
  89
  90  if STATIC_JABBER
  91
  92  st = -DSTATIC
  93  pkg_LTLIBRARIES =
  94 -noinst_LIBRARIES = libjabber.a
  95 -
  96 -libjabber_a_SOURCES = \
  97 -                       asciitab.h \
  98 -                       expat.c \
  99 -                       genhash.c \
 100 -                       hashtable.c \
 101 -                       hashtable.h \
 102 -                       karma.c \
 103 -                       iasciitab.h \
 104 -                       latin1tab.h \
 105 -                       lib.h \
 106 -                       libxode.h \
 107 -                       nametab.h \
 108 -                       pool.c \
 109 -                       sha.c \
 110 -                       snprintf.c \
 111 -                       socket.c \
 112 -                       str.c \
 113 -                       utf8tab.h \
 114 -                       xhash.c \
 115 -                       xmldef.h \
 116 -                       xmlnode.c \
 117 -                       xmlparse.c \
 118 -                       xmlparse.h \
 119 -                       xmlrole.c \
 120 -                       xmlrole.h \
 121 -                       xmltok.c \
 122 -                       xmltok.h \
 123 -                       xmltok_impl.h \
 124 -                       xstream.c \
 125 -                       \
 126 -                       jabber.h \
 127 -                       jconn.c \
 128 -                       jid.c \
 129 -                       jpacket.c \
 130 -                       jutil.c \
 131 -                       log.c \
 132 -                       log.h \
 133 -                       pproxy.c \
 134 -                       rate.c \
 135 -                       \
 136 -                       jabber.c
 137 +noinst_LTLIBRARIES = libjabber-static.la
 138 +libjabber_la_LDFLAGS =
 139
 140  else
 141
 142  st =
 143  pkg_LTLIBRARIES = libjabber.la
 144 -noinst_LIBRARIES =
 145 +noinst_LTLIBRARIES =
 146 +libjabber_la_LDFLAGS =         -module -avoid-version
 147 +
 148 +endif
 149
 150  libjabber_la_SOURCES = \
 151                         asciitab.h \
 152 @@ -101,4 +62,4 @@
 153                         \
 154                         jabber.c
 155
 156 -endif
 157 +libjabber_static_la_SOURCES = $(libjabber_la_SOURCES)
 158 --- gaim-0.56/src/protocols/msn/Makefile.am.wiget       Wed Apr 17 12:24:06 2002
 159 +++ gaim-0.56/src/protocols/msn/Makefile.am     Wed Apr 17 13:15:06 2002
 160 @@ -2,23 +2,24 @@
 161
 162  pkgdir = $(libdir)/gaim
 163
 164 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 165 -libmsn_la_LDFLAGS = -module -avoid-version
 166 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 167
 168  if STATIC_MSN
 169
 170  st = -DSTATIC
 171  pkg_LTLIBRARIES =
 172 -noinst_LIBRARIES = libmsn.a
 173 -
 174 -libmsn_a_SOURCES = msn.c
 175 +noinst_LTLIBRARIES = libmsn-static.la
 176 +libmsn_la_LDFLAGS =
 177
 178  else
 179
 180  st =
 181  pkg_LTLIBRARIES = libmsn.la
 182 -noinst_LIBRARIES =
 183 +noinst_LTLIBRARIES =
 184 +libmsn_la_LDFLAGS = -module -avoid-version
 185 +
 186 +endif
 187
 188  libmsn_la_SOURCES = msn.c
 189
 190 -endif
 191 +libmsn_static_la_SOURCES = $(libmsn_la_SOURCES)
 192 --- gaim-0.56/src/protocols/napster/Makefile.am.wiget   Wed Apr 17 12:25:01 2002
 193 +++ gaim-0.56/src/protocols/napster/Makefile.am Wed Apr 17 13:14:34 2002
 194 @@ -1,22 +1,23 @@
 195  pkgdir = $(libdir)/gaim
 196
 197 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 198 -libnapster_la_LDFLAGS = -module -avoid-version
 199 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 200
 201  if STATIC_NAPSTER
 202
 203  st = -DSTATIC
 204  pkg_LTLIBRARIES =
 205 -noinst_LIBRARIES = libnapster.a
 206 -
 207 -libnapster_a_SOURCES = napster.c
 208 +noinst_LTLIBRARIES = libnapster-static.la
 209 +libnapster_la_LDFLAGS =
 210
 211  else
 212
 213  st =
 214  pkg_LTLIBRARIES = libnapster.la
 215 -noinst_LIBRARIES =
 216 +noinst_LTLIBRARIES =
 217 +libnapster_la_LDFLAGS = -module -avoid-version
 218 +
 219 +endif
 220
 221  libnapster_la_SOURCES = napster.c
 222
 223 -endif
 224 +libnapster_static_la_SOURCES = $(libnapster_la_SOURCES)
 225 --- gaim-0.56/src/protocols/oscar/Makefile.am.wiget     Wed Apr 17 12:18:01 2002
 226 +++ gaim-0.56/src/protocols/oscar/Makefile.am   Wed Apr 17 13:16:00 2002
 227 @@ -3,51 +3,23 @@
 228
 229  pkgdir = $(libdir)/gaim
 230
 231 -CFLAGS += -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 232 -liboscar_la_LDFLAGS =  -module -avoid-version
 233 +AM_CFLAGS = -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\" -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 234
 235  if STATIC_OSCAR
 236
 237  st = -DSTATIC
 238  pkg_LTLIBRARIES =
 239 -noinst_LIBRARIES = liboscar.a
 240 -
 241 -liboscar_a_SOURCES =   admin.c         \
 242 -                       adverts.c       \
 243 -                       auth.c          \
 244 -                       bos.c           \
 245 -                       buddylist.c     \
 246 -                       chat.c          \
 247 -                       chatnav.c       \
 248 -                       conn.c          \
 249 -                       ft.c            \
 250 -                       icq.c           \
 251 -                       im.c            \
 252 -                       info.c          \
 253 -                       invite.c        \
 254 -                       meta.c          \
 255 -                       misc.c          \
 256 -                       msgcookie.c     \
 257 -                       popups.c        \
 258 -                       rxhandlers.c    \
 259 -                       rxqueue.c       \
 260 -                       search.c        \
 261 -                       service.c       \
 262 -                       snac.c          \
 263 -                       ssi.c           \
 264 -                       stats.c         \
 265 -                       tlv.c           \
 266 -                       translate.c     \
 267 -                       txqueue.c       \
 268 -                       util.c          \
 269 -                       oscar.c
 270 -
 271 +noinst_LTLIBRARIES = liboscar-static.la
 272 +liboscar_la_LDFLAGS =
 273
 274  else
 275
 276  st =
 277  pkg_LTLIBRARIES = liboscar.la
 278 -noinst_LIBRARIES =
 279 +noinst_LTLIBRARIES =
 280 +liboscar_la_LDFLAGS =  -module -avoid-version
 281 +
 282 +endif
 283
 284  liboscar_la_SOURCES =  admin.c         \
 285                         adverts.c       \
 286 @@ -79,4 +51,4 @@
 287                         util.c          \
 288                         oscar.c
 289
 290 -endif
 291 +liboscar_static_la_SOURCES = $(liboscar_la_SOURCES)
 292 --- gaim-0.56/src/protocols/toc/Makefile.am.wiget       Wed Apr 17 11:27:30 2002
 293 +++ gaim-0.56/src/protocols/toc/Makefile.am     Wed Apr 17 13:16:30 2002
 294 @@ -2,23 +2,24 @@
 295
 296  pkgdir = $(libdir)/gaim
 297
 298 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 299 -libtoc_la_LDFLAGS = -module -avoid-version
 300 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 301
 302  if STATIC_TOC
 303
 304  st = -DSTATIC
 305  pkg_LTLIBRARIES =
 306 -noinst_LIBRARIES = libtoc.a
 307 -
 308 -libtoc_a_SOURCES = toc.c
 309 +noinst_LTLIBRARIES = libtoc-static.la
 310 +libtoc_la_LDFLAGS =
 311
 312  else
 313
 314  st =
 315  pkg_LTLIBRARIES = libtoc.la
 316 -noinst_LIBRARIES =
 317 +noinst_LTLIBRARIES =
 318 +libtoc_la_LDFLAGS = -module -avoid-version
 319 +
 320 +endif
 321
 322  libtoc_la_SOURCES = toc.c
 323
 324 -endif
 325 +libtoc_static_la_SOURCES = $(libtoc_la_SOURCES)
 326 --- gaim-0.56/src/protocols/yahoo/Makefile.am.wiget     Wed Apr 17 11:26:03 2002
 327 +++ gaim-0.56/src/protocols/yahoo/Makefile.am   Wed Apr 17 13:17:12 2002
 328 @@ -2,23 +2,24 @@
 329
 330  pkgdir = $(libdir)/gaim
 331
 332 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 333 -libyahoo_la_LDFLAGS = -module -avoid-version
 334 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 335
 336  if STATIC_YAHOO
 337
 338  st = -DSTATIC
 339  pkg_LTLIBRARIES =
 340 -noinst_LIBRARIES = libyahoo.a
 341 -
 342 -libyahoo_a_SOURCES = crypt.c yahoo.c
 343 +noinst_LTLIBRARIES = libyahoo-static.la
 344 +libyahoo_la_LDFLAGS =
 345
 346  else
 347
 348  st =
 349  pkg_LTLIBRARIES = libyahoo.la
 350 -noinst_LIBRARIES =
 351 +noinst_LTLIBRARIES =
 352 +libyahoo_la_LDFLAGS = -module -avoid-version
 353 +
 354 +endif
 355
 356  libyahoo_la_SOURCES = crypt.c yahoo.c
 357
 358 -endif
 359 +libyahoo_static_la_SOURCES = $(libyahoo_la_SOURCES)
 360 --- gaim-0.56/src/protocols/zephyr/Makefile.am.wiget    Wed Apr 17 11:18:58 2002
 361 +++ gaim-0.56/src/protocols/zephyr/Makefile.am  Wed Apr 17 13:17:45 2002
 362 @@ -1,86 +1,24 @@
 363  pkgdir = $(libdir)/gaim
 364
 365 -CFLAGS += -I\$(top_srcdir)/src -I\$(top_srcdir)/src/protocols -DCONFDIR=\"$(confdir)\" $(KRB4_CFLAGS) $(st) $(DEBUG_CFLAGS)
 366 +AM_CFLAGS = -I\$(top_srcdir)/src -I\$(top_srcdir)/src/protocols -DCONFDIR=\"$(confdir)\" $(KRB4_CFLAGS) $(st) $(DEBUG_CFLAGS)
 367
 368 -LIBS = @LIBS@ $(KRB4_LDFLAGS) $(KRB4_LIBS)
 369 -libzephyr_la_LDFLAGS =         -module -avoid-version
 370 +libzephyr_la_LIBADD = $(KRB4_LDFLAGS) $(KRB4_LIBS)
 371
 372  if STATIC_ZEPHYR
 373
 374  st = -DSTATIC
 375  pkg_LTLIBRARIES =
 376 -noinst_LIBRARIES = libzephyr.a
 377 -
 378 -libzephyr_a_SOURCES = \
 379 -                       ZAsyncLocate.c \
 380 -                       ZCkAuth.c \
 381 -                       ZCkIfNot.c \
 382 -                       ZClosePort.c \
 383 -                       ZCmpUID.c \
 384 -                       ZCmpUIDP.c \
 385 -                       ZFlsLocs.c \
 386 -                       ZFlsSubs.c \
 387 -                       ZFmtAuth.c \
 388 -                       ZFmtList.c \
 389 -                       ZFmtNotice.c \
 390 -                       ZFmtRaw.c \
 391 -                       ZFmtRawLst.c \
 392 -                       ZFmtSmRLst.c \
 393 -                       ZFmtSmRaw.c \
 394 -                       ZFreeNot.c \
 395 -                       ZGetLocs.c \
 396 -                       ZGetSender.c \
 397 -                       ZGetSubs.c \
 398 -                       ZGetWGPort.c \
 399 -                       ZIfNotice.c \
 400 -                       ZInit.c \
 401 -                       ZLocations.c \
 402 -                       ZMakeAscii.c \
 403 -                       ZMkAuth.c \
 404 -                       ZNewLocU.c \
 405 -                       ZOpenPort.c \
 406 -                       ZParseNot.c \
 407 -                       ZPeekIfNot.c \
 408 -                       ZPeekNot.c \
 409 -                       ZPeekPkt.c \
 410 -                       ZPending.c \
 411 -                       ZReadAscii.c \
 412 -                       ZRecvNot.c \
 413 -                       ZRecvPkt.c \
 414 -                       ZRetSubs.c \
 415 -                       ZSendList.c \
 416 -                       ZSendNot.c \
 417 -                       ZSendPkt.c \
 418 -                       ZSendRLst.c \
 419 -                       ZSendRaw.c \
 420 -                       ZSetDest.c \
 421 -                       ZSetFD.c \
 422 -                       ZSetSrv.c \
 423 -                       ZSubs.c \
 424 -                       ZVariables.c \
 425 -                       ZWait4Not.c \
 426 -                       ZhmStat.c \
 427 -                       Zinternal.c \
 428 -                       com_err.h \
 429 -                       error_message.c \
 430 -                       error_table.h \
 431 -                       et_name.c \
 432 -                       init_et.c \
 433 -                       internal.h \
 434 -                       mit-copyright.h \
 435 -                       mit-sipb-copyright.h \
 436 -                       sysdep.h \
 437 -                       zephyr.h \
 438 -                       zephyr_err.c \
 439 -                       zephyr_err.h \
 440 -                       \
 441 -                       zephyr.c
 442 +noinst_LTLIBRARIES = libzephyr-static.la
 443 +libzephyr_la_LDFLAGS =
 444
 445  else
 446
 447  st =
 448  pkg_LTLIBRARIES = libzephyr.la
 449  noinst_LIBRARIES =
 450 +libzephyr_la_LDFLAGS =         -module -avoid-version
 451 +
 452 +endif
 453
 454  libzephyr_la_SOURCES = \
 455                         ZAsyncLocate.c \
 456 @@ -147,4 +85,4 @@
 457                         \
 458                         zephyr.c
 459
 460 -endif
 461 +libzephyr_static_la_SOURCES = $(libzephyr_la_SOURCES)
 462 --- gaim-0.56/src/protocols/icq/Makefile.am.wiget       Wed Apr 17 11:13:04 2002
 463 +++ gaim-0.56/src/protocols/icq/Makefile.am     Wed Apr 17 13:12:08 2002
 464 @@ -7,64 +7,23 @@
 465
 466  pkgdir = $(libdir)/gaim
 467
 468 -CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 469 -libicq_la_LDFLAGS =    -module -avoid-version
 470 +AM_CFLAGS = -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
 471
 472  if STATIC_ICQ
 473
 474  st = -DSTATIC
 475  pkg_LTLIBRARIES =
 476 -noinst_LIBRARIES = libicq.a
 477 -
 478 -libicq_a_SOURCES =     chatsession.c \
 479 -                       chatsession.h \
 480 -                       contacts.c \
 481 -                       contacts.h \
 482 -                       cyrillic.c \
 483 -                       eventhandle.c \
 484 -                       eventhandle.h \
 485 -                       filesession.c \
 486 -                       filesession.h \
 487 -                       icq.h \
 488 -                       icqbyteorder.c \
 489 -                       icqbyteorder.h \
 490 -                       icqevent.c \
 491 -                       icqevent.h \
 492 -                       icqlib.c \
 493 -                       icqlib.h \
 494 -                       icqpacket.c \
 495 -                       icqpacket.h \
 496 -                       icqtypes.h \
 497 -                       list.c \
 498 -                       list.h \
 499 -                       proxy.c \
 500 -                       queue.c \
 501 -                       queue.h \
 502 -                       socketmanager.c \
 503 -                       socketmanager.h \
 504 -                       stdpackets.c \
 505 -                       stdpackets.h \
 506 -                       tcp.c \
 507 -                       tcp.h \
 508 -                       tcpchathandle.c \
 509 -                       tcpfilehandle.c \
 510 -                       tcphandle.c \
 511 -                       tcplink.c \
 512 -                       tcplink.h \
 513 -                       timeout.c \
 514 -                       timeout.h \
 515 -                       udp.c \
 516 -                       udp.h \
 517 -                       udphandle.c \
 518 -                       util.c \
 519 -                       util.h \
 520 -                       gaim_icq.c
 521 +noinst_LTLIBRARIES = libicq-static.la
 522 +libicq_la_LDFLAGS =
 523
 524  else
 525
 526  st =
 527  pkg_LTLIBRARIES = libicq.la
 528 -noinst_LIBRARIES =
 529 +noinst_LTLIBRARIES =
 530 +libicq_la_LDFLAGS =    -module -avoid-version
 531 +
 532 +endif
 533
 534  libicq_la_SOURCES =    chatsession.c \
 535                         chatsession.h \
 536 @@ -110,4 +69,4 @@
 537                         util.h \
 538                         gaim_icq.c
 539
 540 -endif
 541 +libicq_static_la_SOURCES =     $(libicq_la_SOURCES)
 542 --- gaim-0.56/configure.ac.wiget        Wed Apr 17 14:16:27 2002
 543 +++ gaim-0.56/configure.ac      Wed Apr 17 14:28:02 2002
 544 @@ -58,7 +58,7 @@
 545  extern_init=
 546  load_proto=
 547  for i in $STATIC_PRPLS ; do
 548 -       STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a"
 549 +       STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i-static.la"
 550         extern_init="$extern_init extern void ${i}_init(struct prpl *);"
 551         load_proto="$load_proto load_protocol(${i}_init, sizeof(struct prpl));"
 552         case $i in
 553 @@ -392,6 +392,10 @@
 554  AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h)
 555  AC_CHECK_HEADERS(termios.h)
 556
 557 +dnl workaround
 558 +AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes)
 559 +AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes)
 560 +
 561  AC_OUTPUT([Makefile
 562             doc/Makefile
 563            intl/Makefile