From patchwork Fri Oct 28 20:42:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Reynaldo H. Verdejo Pinochet" X-Patchwork-Id: 1216 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp1275836vsd; Fri, 28 Oct 2016 13:43:21 -0700 (PDT) X-Received: by 10.194.205.1 with SMTP id lc1mr12738333wjc.192.1477687401772; Fri, 28 Oct 2016 13:43:21 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a78si11782189wme.106.2016.10.28.13.43.21; Fri, 28 Oct 2016 13:43:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96B84689F3B; Fri, 28 Oct 2016 23:43:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from s-opensource.com (ec2-52-27-115-49.us-west-2.compute.amazonaws.com [52.27.115.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9BC3689E50 for ; Fri, 28 Oct 2016 23:43:08 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by s-opensource.com (Postfix) with ESMTP id B687DA0DE7; Fri, 28 Oct 2016 20:43:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osg.samsung.com Received: from s-opensource.com ([127.0.0.1]) by localhost (s-opensource.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QZPH9qUqaufV; Fri, 28 Oct 2016 20:43:17 +0000 (UTC) Received: from blackie3.hsd1.ca.comcast.net. (c-50-184-240-129.hsd1.ca.comcast.net [50.184.240.129]) by s-opensource.com (Postfix) with ESMTPSA id A020FA0E78; Fri, 28 Oct 2016 20:43:17 +0000 (UTC) From: reynaldo@osg.samsung.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2016 13:42:44 -0700 Message-Id: <20161028204244.18929-1-reynaldo@osg.samsung.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] configure: add '-uninstalled' to uninstalled .pc files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: "Reynaldo H. Verdejo Pinochet" MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: "Reynaldo H. Verdejo Pinochet" pkg-config(1) expects uninstalled pc files to follow the blah-uninstalled.pc naming convention and the behavior of the program is impacted by it. Without this fix overriding PKGP_CONFIG_LIBDIR is required to ensure uninstalled files are preferred (overkill), instead of just adding pc-uninstalled/ to the utility's search path by setting PKG_CONFIG_PATH accordingly. Signed-off-by: Reynaldo H. Verdejo Pinochet --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 7476ca8..a26b91c 100755 --- a/configure +++ b/configure @@ -6813,7 +6813,7 @@ EOF mkdir -p doc/examples/pc-uninstalled includedir=${source_path} [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." - cat < doc/examples/pc-uninstalled/$name.pc + cat < doc/examples/pc-uninstalled/${name}-uninstalled.pc prefix= exec_prefix= libdir=\${pcfiledir}/../../../$name