Changeset 125


Ignore:
Timestamp:
Feb 10, 2006, 8:52:44 PM (15 years ago)
Author:
joshe
Message:

Improve libintl.h search and add a --gettext-prefix configure option.
Update a couple copyright dates that slipped through earlier.
Spell GTK as GTK+ in a couple of places.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r122 r125  
    55 - Rewritten choking algorithm
    66 - Remembers download and upload sizes from one launch to another
    7  - New GTK interface
     7 - New GTK+ interface
    88 - New BeOS interface
    99 - OS X: Dock badging
  • trunk/README

    r122 r125  
    77
    88Transmission is open source (MIT license) and runs on Mac OS X (Cocoa
    9 interface), Linux/NetBSD/FreeBSD/OpenBSD (GTK interface) and BeOS
     9interface), Linux/NetBSD/FreeBSD/OpenBSD (GTK+ interface) and BeOS
    1010(native interface).
    1111
  • trunk/configure

    r116 r125  
    1111    --disable-openssl      Disable OpenSSL, use built-in SHA1 implementation
    1212    --openssl-prefix=PATH  Location of OpenSSL headers and library
     13    --gettext-prefix=PATH  Location of the Gettext header and library
    1314    --disable-gtk          Don't build the GTK+ GUI
    1415    --prefix=PATH          Install here instead of $INSTALL_PREFIX
     
    5455  }
    5556EOF
     57
     58  if [ -n "$GETTEXT_PREFIX" ] && $CC "-I$GETTEXT_PREFIX/include" "-Wl,-R$GETTEXT_PREFIX/lib" "-L$GETTEXT_PREFIX/lib" -lintl -liconv -o testconf testconf.c >/dev/null 2>&1
     59  then
     60    GTKCCFLAGS="-I$GETTEXT_PREFIX/include $GTKCCFLAGS"
     61    GTKLINKLIBS="-Wl,-R$GETTEXT_PREFIX/lib -L$GETTEXT_PREFIX/lib -lintl -liconv $GTKLINKLIBS"
     62    rm -f testconf.c testconf
     63    return 0
     64  fi
     65
    5666  if $CC $GTKCCFLAGS $GTKLINKLIBS -o testconf testconf.c > /dev/null 2>&1
    5767  then
     
    6070  fi
    6171
    62   # XXX there has to be a better way than this
    63   for intl_testdir in /usr/local/include /usr/X11R6/include /usr/pkg/include
     72  for intl_testdir in $INSTALL_PREFIX/include \
     73      /usr/local/include /usr/X11R6/include /usr/pkg/include
    6474  do
    6575    if $CC $GTKCCFLAGS -I$intl_testdir $GTKLINKLIBS -o testconf testconf.c > /dev/null 2>&1
     
    99109          GTKCCFLAGS=
    100110          GTKLINKLIBS=
    101           echo "GTK+:    no, could not find libintl.h"
     111          echo "GTK+:    no, could not find gettext libintl.h"
    102112          GTK=no
    103113        fi
     
    150160    x--openssl-prefix=*)
    151161      OPENSSL_PREFIX="$param";
     162      ;;
     163    x--gettext-prefix=*)
     164      GETTEXT_PREFIX="$param";
    152165      ;;
    153166    x--disable-gtk)
  • trunk/gtk/dialogs.h

    r89 r125  
    11/*
    2   Copyright (c) 2005 Joshua Elsasser. All rights reserved.
     2  Copyright (c) 2005-2006 Joshua Elsasser. All rights reserved.
    33   
    44  Redistribution and use in source and binary forms, with or without
  • trunk/gtk/util.c

    r114 r125  
    11/*
    2   Copyright (c) 2005 Joshua Elsasser. All rights reserved.
     2  Copyright (c) 2005-2006 Joshua Elsasser. All rights reserved.
    33   
    44  Redistribution and use in source and binary forms, with or without
  • trunk/gtk/util.h

    r96 r125  
    11/*
    2   Copyright (c) 2005 Joshua Elsasser. All rights reserved.
     2  Copyright (c) 2005-2006 Joshua Elsasser. All rights reserved.
    33   
    44  Redistribution and use in source and binary forms, with or without
Note: See TracChangeset for help on using the changeset viewer.