Commit b3d0e4e2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

configure: fix the nghttp2 detection when not found

parent 2ddd69ef

configure.ac

+26 −27
Original line number Original line Diff line number Diff line
@@ -2732,7 +2732,6 @@ dnl ********************************************************************** 
dnl Check for nghttp2

dnl Check for nghttp2

dnl **********************************************************************

dnl **********************************************************************





AC_MSG_CHECKING([whether to build with nghttp2])

OPT_H2="yes"

OPT_H2="yes"

AC_ARG_WITH(nghttp2,

AC_ARG_WITH(nghttp2,

AC_HELP_STRING([--with-nghttp2=PATH],[Enable nghttp2 usage])

AC_HELP_STRING([--with-nghttp2=PATH],[Enable nghttp2 usage])
@@ -2742,19 +2741,16 @@ case "$OPT_H2" in 
  no)

  no)

    dnl --without-nghttp2 option used

    dnl --without-nghttp2 option used

    want_h2="no"

    want_h2="no"

    AC_MSG_RESULT([no])

    ;;

    ;;

  yes)

  yes)

    dnl --with-nghttp2 option used without path

    dnl --with-nghttp2 option used without path

    want_h2="yes"

    want_h2="default"

    want_h2_path=""

    want_h2_path=""

    AC_MSG_RESULT([yes])

    ;;

    ;;

  *)

  *)

    dnl --with-nghttp2 option used with path

    dnl --with-nghttp2 option used with path

    want_h2="yes"

    want_h2="yes"

    want_h2_path="$withval/lib/pkgconfig"

    want_h2_path="$withval/lib/pkgconfig"

    AC_MSG_RESULT([yes ($withval)])

    ;;

    ;;

esac

esac
@@ -2780,12 +2776,6 @@ if test X"$want_h2" != Xno; then 
      $PKGCONFIG --libs-only-L libnghttp2`

      $PKGCONFIG --libs-only-L libnghttp2`

    AC_MSG_NOTICE([-L is $LD_H2])

    AC_MSG_NOTICE([-L is $LD_H2])





  else

    dnl To avoid link errors, we do not allow --libnghttp2 without

    dnl a pkgconfig file

    AC_MSG_ERROR([--with-nghttp2 was specified but could not find libnghttp2 pkg-config file.])

  fi



    LDFLAGS="$LDFLAGS $LD_H2"

    LDFLAGS="$LDFLAGS $LD_H2"

    CPPFLAGS="$CPPFLAGS $CPP_H2"

    CPPFLAGS="$CPPFLAGS $CPP_H2"

    LIBS="$LIB_H2 $LIBS"

    LIBS="$LIB_H2 $LIBS"
@@ -2805,6 +2795,15 @@ if test X"$want_h2" != Xno; then 
        LIBS=$CLEANLIBS

        LIBS=$CLEANLIBS

    )

    )





  else

    dnl no nghttp2 pkg-config found, deal with it

    if test X"$want_h2" != Xdefault; then

      dnl To avoid link errors, we do not allow --with-nghttp2 without

      dnl a pkgconfig file

      AC_MSG_ERROR([--with-nghttp2 was specified but could not find libnghttp2 pkg-config file.])

    fi

  fi



fi

fi





dnl **********************************************************************

dnl **********************************************************************