Blame patches/weechat-3.6_pre.local.patch

efb4d0
diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac
efb4d0
--- weechat-2.9.orig/configure.ac	2020-07-18 13:59:02.000000000 +0200
efb4d0
+++ weechat-2.9/configure.ac	2020-10-06 22:27:28.776471083 +0200
efb4d0
@@ -192,18 +192,6 @@
efb4d0
 fi
efb4d0
 
efb4d0
 # ------------------------------------------------------------------------------
efb4d0
-#                                  pkg-config
efb4d0
-# ------------------------------------------------------------------------------
efb4d0
-
efb4d0
-PKGCONFIG=""
efb4d0
-AC_CHECK_PROGS(PKGCONFIG, pkg-config)
efb4d0
-if test "x$PKGCONFIG" = "x"; then
efb4d0
-    AC_MSG_ERROR([
efb4d0
-*** "pkg-config" couldn't be found on your system.
efb4d0
-*** Try to install it with your software package manager.])
efb4d0
-fi
efb4d0
-
efb4d0
-# ------------------------------------------------------------------------------
efb4d0
 #                                dynamic loader
efb4d0
 # ------------------------------------------------------------------------------
efb4d0
 
678ef0
@@ -398,52 +398,6 @@
678ef0
678ef0
 # ---------------------------------- perl --------------------------------------
678ef0
678ef0
-PERL_VERSION=
678ef0
-
678ef0
-if test "x$enable_perl" = "xyes" ; then
678ef0
-    AC_PATH_PROGS(PERL, perl perl5)
678ef0
-    if test -z $PERL ; then
678ef0
-        AC_MSG_WARN([
678ef0
-*** Perl must be installed on your system but perl interpreter couldn't be found in path.
678ef0
-*** Please check that perl is in path, or install it with your software package manager.
678ef0
-*** WeeChat will be built without Perl support.])
678ef0
-        enable_perl="no"
678ef0
-        not_found="$not_found perl"
678ef0
-    else
678ef0
-        PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"`
678ef0
-        AC_MSG_CHECKING(for Perl headers files)
678ef0
-
678ef0
-        PERL_HEADER_TEST=`PT=perltest.c ; echo "#include <EXTERN.h>" > $PT;  echo "#include <perl.h>" >> $PT;  echo "#include <XSUB.h>" >> $PT ;  echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`
678ef0
-
678ef0
-        if test "x$PERL_HEADER_TEST" = "x0" ; then
678ef0
-            PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts`
678ef0
-            AC_MSG_RESULT(found)
678ef0
-            AC_MSG_CHECKING(for Perl library)
678ef0
-            PERL_LIB_TEST=`PT=perltest.c ; echo "int main() { return 0; }" > $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`
678ef0
-            if test "x$PERL_LIB_TEST" = "x0" ; then
678ef0
-                PERL_LFLAGS=`$PERL -MExtUtils::Embed -e ldopts`
678ef0
-                AC_MSG_RESULT(found)
678ef0
-            else
678ef0
-                AC_MSG_WARN([
678ef0
-*** Perl library couldn't be found on your system.
678ef0
-*** Try to install it with your software package manager.
678ef0
-*** WeeChat will be built without Perl support.])
678ef0
-                enable_perl="no"
678ef0
-                not_found="$not_found perl"
678ef0
-            fi
678ef0
-        else
678ef0
-            AC_MSG_WARN([
678ef0
-*** Perl headers couldn't be found on your system.
678ef0
-*** Try to install it with your software package manager.
678ef0
-*** WeeChat will be built without Perl support.])
678ef0
-            enable_perl="no"
678ef0
-            not_found="$not_found perl"
678ef0
-        fi
678ef0
-    fi
678ef0
-else
678ef0
-    not_asked="$not_asked perl"
678ef0
-fi
678ef0
-
678ef0
 if test "x$enable_perl" = "xyes" ; then
678ef0
     AC_SUBST(PERL_CFLAGS)
678ef0
     AC_SUBST(PERL_LFLAGS)
efb4d0
@@ -1049,8 +1037,8 @@
efb4d0
 *** or try to install it with your software package manager.])
efb4d0
 else
efb4d0
     AC_MSG_RESULT(yes)
efb4d0
-    GCRYPT_CFLAGS=`libgcrypt-config --cflags`
efb4d0
-    GCRYPT_LFLAGS=`libgcrypt-config --libs`
efb4d0
+    GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
efb4d0
+    GCRYPT_LFLAGS=`$LIBGCRYPT_CONFIG --libs`
efb4d0
     AC_SUBST(GCRYPT_CFLAGS)
efb4d0
     AC_SUBST(GCRYPT_LFLAGS)
efb4d0
 fi
efb4d0
@@ -1070,8 +1058,8 @@
efb4d0
 *** or try to install it with your software package manager.])
efb4d0
 else
efb4d0
     AC_MSG_RESULT(yes)
efb4d0
-    GNUTLS_CFLAGS=`pkg-config gnutls --cflags`
efb4d0
-    GNUTLS_LFLAGS=`pkg-config gnutls --libs`
efb4d0
+    GNUTLS_CFLAGS=`$PKGCONFIG gnutls --cflags`
efb4d0
+    GNUTLS_LFLAGS=`$PKGCONFIG gnutls --libs`
efb4d0
     AC_SUBST(GNUTLS_CFLAGS)
efb4d0
     AC_SUBST(GNUTLS_LFLAGS)
efb4d0
 fi
efb4d0
@@ -1160,8 +1148,8 @@
efb4d0
 *** or try to install it with your software package manager.])
efb4d0
 else
efb4d0
     AC_MSG_RESULT(yes)
efb4d0
-    ZLIB_CFLAGS=`pkg-config zlib --cflags`
efb4d0
-    ZLIB_LFLAGS=`pkg-config zlib --libs`
efb4d0
+    ZLIB_CFLAGS=`$PKGCONFIG zlib --cflags`
efb4d0
+    ZLIB_LFLAGS=`$PKGCONFIG zlib --libs`
efb4d0
     AC_SUBST(ZLIB_CFLAGS)
efb4d0
     AC_SUBST(ZLIB_LFLAGS)
efb4d0
 fi