pidgin/purple-plugin-pack

merge of '35d74890431db8cb7be5532781d1ce431afa2071'
org.guifications.plugins
2007-06-22, grim
3d417d233ea6
Parents 534c921ea18884a4ea47bbb4
Children 70b41cf0620f
merge of '35d74890431db8cb7be5532781d1ce431afa2071'
and 'ffac2cfb824d286c5db3dea4b95e85287cffa235'
1 files changed, 25 insertions(+), 6 deletions(-)
  • +25 -6
    configure.ac
    • --- a/configure.ac Fri Jun 22 02:59:03 2007 -0400
    +++ b/configure.ac Fri Jun 22 03:01:54 2007 -0400
    @@ -78,8 +78,14 @@
    HAVE_PURPLE="yes"
    AM_CONDITIONAL(HAVE_PURPLE, true)
    -PURPLE_LIBDIR=`pkg-config --variable=libdir purple`
    -PURPLE_DATADIR=`pkg-config --variable=datadir purple`
    +if test x"$prefix" = x"NONE" ; then
    + PURPLE_LIBDIR=`pkg-config --variable=libdir purple`
    + PURPLE_DATADIR=`pkg-config --variable=datadir purple`
    +else
    + PURPLE_LIBDIR="$libdir"
    + PURPLE_DATADIR="$datadir"
    +fi
    +
    PURPLE_PIXMAPSDIR=""
    # this is a hack but should work fine.
    @@ -117,8 +123,14 @@
    AM_CONDITIONAL(HAVE_PIDGIN, false)
    ])
    -PIDGIN_LIBDIR=`pkg-config --variable=libdir pidgin`
    -PIDGIN_DATADIR=`pkg-config --variable=datadir pidgin`
    +if test x"$prefix" = x"NONE" ; then
    + PIDGIN_LIBDIR=`pkg-config --variable=libdir pidgin`
    + PIDGIN_DATADIR=`pkg-config --variable=datadir pidgin`
    +else
    + PIDGIN_LIBDIR="$libdir"
    + PIDGIN_DATADIR="$datadir"
    +fi
    +
    PIDGIN_PIXMAPSDIR=""
    if test x"$PIDGIN_LIBDIR" != x"" ; then
    @@ -149,8 +161,14 @@
    AM_CONDITIONAL(HAVE_FINCH, false)
    ])
    -FINCH_LIBDIR=`pkg-config --variable=libdir finch`
    -FINCH_DATADIR=`pkg-config --variable=datadir finch`
    +if test x"$prefix" = x"NONE" ; then
    + FINCH_LIBDIR=`pkg-config --variable=libdir finch`
    + FINCH_DATADIR=`pkg-config --variable=datadir finch`
    +else
    + FINCH_LIBDIR="$libdir"
    + FINCH_DATADIR="$datadir"
    +fi
    +
    FINCH_PIXMAPSDIR=""
    if test x"$FINCH_LIBDIR" != x"" ; then
    @@ -289,6 +307,7 @@
    broadcast/Makefile
    buddytime/Makefile
    chronic/Makefile
    + convbadger/Makefile
    dice/Makefile
    difftopic/Makefile
    eight_ball/Makefile