Commit 95ded2c5 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

configure: make it work without PKG_CHECK_MODULES 

With commit c2f9b78a we added a new dependency on pkg-config for
developers which may be unwanted. This change make the configure script
still work as before if pkg-config isn't installed, it'll just use the
old zlib detection logic without pkg-config.

Reported-by: Marc Hörsken

Fixes #972
parent fba9dec5

configure.ac

+4 −1
Original line number Original line Diff line number Diff line
@@ -892,6 +892,8 @@ else 
  fi

  fi





  if test -z "$OPT_ZLIB" ; then

  if test -z "$OPT_ZLIB" ; then



    m4_ifdef([PKG_CHECK_MODULES], [

      PKG_CHECK_MODULES([ZLIB], [zlib],

      PKG_CHECK_MODULES([ZLIB], [zlib],

        [ LIBS="${ZLIB_LIBS} $LIBS"

        [ LIBS="${ZLIB_LIBS} $LIBS"

          CPPFLAGS="${ZLIB_CFLAGS} $CPPFLAGS"

          CPPFLAGS="${ZLIB_CFLAGS} $CPPFLAGS"
@@ -899,6 +901,7 @@ else 
        ],

        ],

        [

        [

        ])

        ])

    ])





    if test -z "$HAVE_LIBZ"; then

    if test -z "$HAVE_LIBZ"; then