Re: [Bug-wget] *BROKEN* Configure cleanup

2014-11-20 Thread Tim Ruehsen
On Thursday 20 November 2014 15:36:57 Darshit Shah wrote:
 On 11/20, Darshit Shah wrote:
 How does this look for another attempt at the configure file?
 
 Here's another patch that uses pkg-config to check for libpsl
 
 Also, if there are no objections, I'll also push the patch that adds -Wextra
 to the default CFLAGS.

Sorry, you forgot

# correct $LIBPSL_LIBS (in libpsl = 0.6.0)
AS_IF([test x$LIBPSL_LIBS = x-llibpsl ], [LIBPSL_LIBS=-lpsl])

Missing this, ./configure will not work any more (you called it spurious 
errors).

Please add it ASAP, just can't build Wget right now.

My code example was:

AC_ARG_WITH(libpsl, AS_HELP_STRING([--without-libpsl], [disable support for 
libpsl cookie checking]), with_libpsl=$withval, with_libpsl=yes)
AS_IF([test x$with_libpsl != xno], [
  PKG_CHECK_MODULES([LIBPSL], libpsl, [
with_libpsl=yes
# correct $LIBPSL_LIBS (in libpsl = 0.6.0)
AS_IF([test x$LIBPSL_LIBS = x-llibpsl ], [LIBPSL_LIBS=-lpsl])
LIBS=$LIBPSL_LIBS $LIBS
CFLAGS=$LIBPSL_CFLAGS $CFLAGS
AC_DEFINE([WITH_LIBPSL], [1], [PSL support enabled])
  ], [
AC_SEARCH_LIBS(psl_builtin, psl,
  [with_libpsl=yes; AC_DEFINE([WITH_LIBPSL], [1], [PSL support enabled])],
  [with_libpsl=no;  AC_MSG_WARN(*** libpsl was not found. Fallback to 
builtin cookie checking.)])
  ])
])

Tim


signature.asc
Description: This is a digitally signed message part.


Re: [Bug-wget] *BROKEN* Configure cleanup

2014-11-20 Thread Tim Rühsen
Am Donnerstag, 20. November 2014, 15:42:22 schrieb Tim Ruehsen:
 On Thursday 20 November 2014 15:36:57 Darshit Shah wrote:
  On 11/20, Darshit Shah wrote:
  How does this look for another attempt at the configure file?
  
  Here's another patch that uses pkg-config to check for libpsl
  
  Also, if there are no objections, I'll also push the patch that adds
  -Wextra to the default CFLAGS.
 
 Sorry, you forgot
 
 # correct $LIBPSL_LIBS (in libpsl = 0.6.0)
 AS_IF([test x$LIBPSL_LIBS = x-llibpsl ], [LIBPSL_LIBS=-lpsl])
 
 Missing this, ./configure will not work any more (you called it spurious
 errors).
 
 Please add it ASAP, just can't build Wget right now.
 
 My code example was:
 
 AC_ARG_WITH(libpsl, AS_HELP_STRING([--without-libpsl], [disable support for
 libpsl cookie checking]), with_libpsl=$withval, with_libpsl=yes)
 AS_IF([test x$with_libpsl != xno], [
   PKG_CHECK_MODULES([LIBPSL], libpsl, [
 with_libpsl=yes
 # correct $LIBPSL_LIBS (in libpsl = 0.6.0)
 AS_IF([test x$LIBPSL_LIBS = x-llibpsl ], [LIBPSL_LIBS=-lpsl])
 LIBS=$LIBPSL_LIBS $LIBS
 CFLAGS=$LIBPSL_CFLAGS $CFLAGS
 AC_DEFINE([WITH_LIBPSL], [1], [PSL support enabled])
   ], [
 AC_SEARCH_LIBS(psl_builtin, psl,
   [with_libpsl=yes; AC_DEFINE([WITH_LIBPSL], [1], [PSL support
 enabled])], [with_libpsl=no;  AC_MSG_WARN(*** libpsl was not found.
 Fallback to builtin cookie checking.)])
   ])
 ])
 
 Tim

I had to fix it here anyway for testing.
I pushed the fix.

Tim

signature.asc
Description: This is a digitally signed message part.


Re: [Bug-wget] *BROKEN* Configure cleanup

2014-11-20 Thread Darshit Shah

On 11/20, Tim Rühsen wrote:

On Thursday 20 November 2014 15:36:57 Darshit Shah wrote:

On 11/20, Darshit Shah wrote:
How does this look for another attempt at the configure file?

Here's another patch that uses pkg-config to check for libpsl

Also, if there are no objections, I'll also push the patch that adds -Wextra
to the default CFLAGS.


Sorry, you forgot

   # correct $LIBPSL_LIBS (in libpsl = 0.6.0)
   AS_IF([test x$LIBPSL_LIBS = x-llibpsl ], [LIBPSL_LIBS=-lpsl])

Missing this, ./configure will not work any more (you called it spurious
errors).

Please add it ASAP, just can't build Wget right now.

Oops! Sorry. Yes, you mentioned it in the earlier mail, but I had this code 
already in my git stash, so I just popped it and turned it into a commit.


Also, on Arch Linux, since we're currently using libpsl 0.6.2, the configure 
code worked correctly.


Thanks for pushing the required changes.


--
Thanking You,
Darshit Shah


pgpeTb_W6bcp9.pgp
Description: PGP signature