ekg-LDFLAGS.patch

   1 --- configure.in        2007-03-11 13:27:04.000000000 +0100
   2 +++ configure.in-new    2007-05-31 23:16:33.300670618 +0200
   3 @@ -292,7 +292,7 @@
   4
   5  if test "x$have_openssl" = "xyes"; then
   6         OBJS="$OBJS simlite.o"
   7 -       LDFLAGS="$OPENSSL_LIBS $LDFLAGS"
   8 +       LIBS="$OPENSSL_LIBS $LIBS"
   9         CFLAGS="$CFLAGS $OPENSSL_INCLUDES"
  10         if test "x$enable_libgadu_openssl" != "xno"; then
  11                 LIBS_LIBGADU="$LIBS_LIBGADU $OPENSSL_LIBS"
  12 @@ -394,7 +394,7 @@
  13                 AC_MSG_ERROR([You need ncurses and ncurses-devel packages.])
  14         fi
  15
  16 -       LDFLAGS="$LDFLAGS $CURSES_LIBS"
  17 +       LIBS="$LIBS $CURSES_LIBS"
  18         CFLAGS="$CFLAGS $CURSES_INCLUDES"
  19         echo "CURSES_INCLUDES=$CURSES_INCLUDES"
  20  fi
  21 @@ -407,11 +407,11 @@
  22                 TERMCAP_LIB=""
  23         else
  24                 AC_CHECK_LIB(termcap, tgetent, [TERMCAP_LIB="-ltermcap"])
  25 -               LDFLAGS="$LDFLAGS $TERMCAP_LIB"
  26 +               LIBS="$LIBS $TERMCAP_LIB"
  27         fi
  28                 if test "x$TERMCAP_LIB" = "x" -a "x$CURSES_LIBS" = "x"; then
  29                 AC_CHECK_NCURSES
  30 -               LDFLAGS="$LDFLAGS $CURSES_LIBS"
  31 +               LIBS="$LIBS $CURSES_LIBS"
  32                 CFLAGS="$CFLAGS $CURSES_INCLUDES"
  33         fi
  34
  35 @@ -421,7 +421,7 @@
  36                 AC_MSG_ERROR([You need both readline and readline-devel packages.])
  37         fi
  38
  39 -       LDFLAGS="$READLINE_LIBS $LDFLAGS"
  40 +       LIBS="$READLINE_LIBS $LIBS"
  41         CFLAGS="$CFLAGS $READLINE_INCLUDES"
  42
  43         AC_CHECK_FUNCS([rl_set_prompt rl_filename_completion_function rl_get_screen_size rl_set_key rl_bind_key_in_map])
  44 @@ -453,7 +453,7 @@
  45                 AC_CHECK_HEADERS(linux/soundcard.h,
  46                 [
  47                         AC_DEFINE(HAVE_VOIP, 1, [define if you want VOIP support])
  48 -                       LDFLAGS="-lgsm $LDFLAGS"
  49 +                       LIBS="-lgsm $LIBS"
  50                         OBJS="$OBJS voice.o"
  51                 ])
  52         fi
  53 @@ -472,7 +472,7 @@
  54                 AC_CHECK_HEADERS(gif_lib.h,
  55                 [
  56                         AC_DEFINE(HAVE_LIBUNGIF, 1, [define if you have libungif])
  57 -                       LDFLAGS="-lungif $LDFLAGS"
  58 +                       LIBS="-lungif $LIBS"
  59                         have_libungif=yes
  60                 ])
  61         ])
  62 @@ -491,7 +491,7 @@
  63                 AC_CHECK_HEADERS(jpeglib.h,
  64                 [
  65                         AC_DEFINE(HAVE_LIBJPEG, 1, [define if you have libjpeg])
  66 -                       LDFLAGS="-ljpeg $LDFLAGS"
  67 +                       LIBS="-ljpeg $LIBS"
  68                         have_libjpeg=yes
  69                 ])
  70         ])
  71 @@ -505,7 +505,7 @@
  72
  73  if test "x$have_python" = "xyes"; then
  74         OBJS="$OBJS python.o"
  75 -       LDFLAGS="$PYTHON_LIBS $LDFLAGS"
  76 +       LIBS="$PYTHON_LIBS $LIBS"
  77         CFLAGS="$CFLAGS $PYTHON_INCLUDES"
  78  fi
  79
  80 @@ -522,7 +522,7 @@
  81                 AC_CHECK_HEADERS(zlib.h,
  82                 [
  83                         AC_DEFINE(HAVE_ZLIB, 1, [define if you want compressed logs])
  84 -                       LDFLAGS="-lz $LDFLAGS"
  85 +                       LIBS="-lz $LIBS"
  86                         have_zlib=yes
  87                 ])
  88         ])
  89 @@ -566,7 +566,7 @@
  90             if test "x$have_aspell_libs" = "xyes"; then
  91                 if test "x$ui_ncurses_default" = "xyes"; then
  92                     AC_DEFINE(WITH_ASPELL, 1, [define if you want aspell support])
  93 -                   LDFLAGS="$LDFLAGS -laspell"
  94 +                   LIBS="$LIBS -laspell"
  95                 fi
  96             else
  97                 enable_aspell=no
  98 --- lib/Makefile.in     2006-04-18 21:05:11.000000000 +0200
  99 +++ lib/Makefile.in-new 2007-05-31 23:18:35.346799383 +0200
 100 @@ -12,7 +12,8 @@
 101
 102  CC = @CC@
 103  CFLAGS = @CFLAGS_LIBGADU@ -I. -I..
 104 -LIBS = @LIBS_LIBGADU@
 105 +LDFLAGS = @LDFLAGS@
 106 +LIBS = @LIBS@ @LIBS_LIBGADU@
 107
 108  MAKE = @MAKE@
 109  AR = @AR@
 110 @@ -56,7 +57,7 @@
 111  shared:        dep $(SHARED)
 112
 113  $(SHARED): $(LOBJS)
 114 -       $(CC) -shared -Wl,-soname,libgadu.so.$(VERSION_MAJOR) -o $(SHARED) $(LOBJS) $(LIBS) -lc
 115 +       $(CC) $(LDFLAGS) -shared -Wl,-soname,libgadu.so.$(VERSION_MAJOR) -o $(SHARED) $(LOBJS) $(LIBS) -lc
 116         $(LN_S) -f $(SHARED) $(SHAREDM)
 117         $(LN_S) -f $(SHARED) $(SHAREDMM)
 118
 119 --- src/Makefile.in     2007-04-28 22:02:22.000000000 +0200
 120 +++ src/Makefile.in-new 2007-05-31 23:20:07.254747976 +0200
 121 @@ -28,10 +28,10 @@
 122
 123  ekg:   $(OBJS) comptime.c @libgadu_a@
 124         $(CC) $(CFLAGS) -c -o comptime.o comptime.c
 125 -       $(CC) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LDFLAGS) $(LIBS)
 126 +       $(CC) $(LDFLAGS) $(CFLAGS) -o ekg $(OBJS) comptime.o -L../lib @lgadu@ @libgadu_a@ $(LIBS)
 127
 128  ioctld:        ioctld.c
 129 -       $(CC) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
 130 +       $(CC) $(LDFLAGS) $(CFLAGS) ioctld.c -o ioctld $(LIBS) @IOCTLD_OBJS@
 131
 132  dep:   .depend
 133