ekg-LDFLAGS.patch

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