Mercurial > pidgin.yaz
changeset 4884:5496d1704ee0
[gaim-migrate @ 5214]
Aaron Namba (musicmanan) writes:
" I am using target i386-unknown-freebsd4.7 with perl
5.00503. I had to modify src/perl.c slightly to get it
libintl.a to link properly. I got this idea from
http://archive.develooper.com/perl-xs@perl.org/msg00773.html,
not sure whether it was the proper thing to do. But
gaim seems to work properly.
Here's the diff... "
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Tue, 25 Mar 2003 01:20:36 +0000 |
| parents | 3c3bafae42e8 |
| children | 1bf59e3ac4ff |
| files | configure.ac src/perl.c |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Mar 24 22:05:16 2003 +0000 +++ b/configure.ac Tue Mar 25 01:20:36 2003 +0000 @@ -149,7 +149,7 @@ AC_PATH_PROG(gaimpath, gaim) CFLAGS="$CFLAGS $GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" -AC_PATH_X +AC_PATH_XTRA dnl Check for XScreenSaver if test "x$enable_xss" = "xyes" ; then @@ -157,14 +157,15 @@ LIBS="$LIBS $GTK_LIBS -L$x_libraries" XSS_LIBS="no" XSS_HEADERS="no" - AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries"],[],[-lX11 -lXext -lm]) - AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="-L$x_libraries -lXss"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xext, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_EXTRA_LIBS"],[],[-lX11 -lXext -lm]) + AC_CHECK_LIB(Xss, XScreenSaverRegister,[XSS_LIBS="$X_LIBS $X_PRE_LIBS -lX11 -lXext $X_LIBS $X_EXTRA_LIBS -lXss"],[],[-lX11 -lXext -lm]) if test \! "$XSS_LIBS" = "no"; then AC_TRY_COMPILE([ +#include <X11/Xlib.h> #include <X11/extensions/scrnsaver.h> - ],[],[enable_xss=no],[ - AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.]) - ]) + ],[],[ + AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])],[enable_xss=no] + ) else XSS_LIBS="" enable_xss=no
--- a/src/perl.c Mon Mar 24 22:05:16 2003 +0000 +++ b/src/perl.c Tue Mar 25 01:20:36 2003 +0000 @@ -34,6 +34,10 @@ #ifdef USE_PERL +#ifndef call_pv +# define call_pv(i,j) perl_call_pv(i,j) +#endif + #define group perl_group #ifdef _WIN32 /* This took me an age to figure out.. without this __declspec(dllimport)