Only call {set,clear}_semaphore probe function if they are not NULL

[deliverable/binutils-gdb.git] / gdb / acx_configure_dir.m4

diff --git a/gdb/acx_configure_dir.m4 b/gdb/acx_configure_dir.m4
index 57a64a62f49a35c4ba13cfc192e8c6475ed11e98..5a76ebad6ecabaf03dbf401e636a69b6e49b5f5e 100644 (file)
--- a/gdb/acx_configure_dir.m4
+++ b/gdb/acx_configure_dir.m4
@@ -1,6 +1,4 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -89,7 +87,12 @@ AC_DEFUN([ACX_CONFIGURE_DIR],
   _AS_ECHO([$ac_msg])
   AS_MKDIR_P(["$ac_dir"])
 
-  ac_srcdir=../$srcdir/$in_src
+  case $srcdir in
+  [[\\/]]* | ?:[[\\/]]* )
+    ac_srcdir=$srcdir/$in_src ;;
+  *) # Relative name.
+    ac_srcdir=../$srcdir/$in_src ;;
+  esac
 
   cd "$ac_dir"