From: Andreas Fritiofson Date: Thu, 25 Jul 2013 19:39:58 +0000 (+0200) Subject: configure.ac: Remove obsolete(?) oddity X-Git-Tag: v0.8.0-rc1~335 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc731bda98f40253ebb7e710dd5646ac448f83de;p=openocd configure.ac: Remove obsolete(?) oddity It causes build failure by adding the build system's includes to the compiler's search path when cross-compiling with --prefix=/usr. Building seems to work fine without it. It was added in f7274784. No idea what it was trying to solve that couldn't be covered in a better way. Change-Id: Ia32863f0b0cbd498eb34bd2fce73126db5b71a1f Signed-off-by: Andreas Fritiofson Reviewed-on: http://openocd.zylin.com/1530 Tested-by: jenkins Reviewed-by: Spencer Oliver Reviewed-by: Xiaofan --- diff --git a/configure.ac b/configure.ac index 623e6317..1a647475 100644 --- a/configure.ac +++ b/configure.ac @@ -150,39 +150,6 @@ else fi AC_MSG_RESULT([$build_release]) -# We are not *ALWAYS* being installed in the standard place. -# We may be installed in a "tool-build" specific location. -# Normally with other packages - as part of a tool distro. -# Thus - we should search that 'libdir' also. -# -# And - if we are being installed there - the odds are -# The libraries unique to what we are are there too. -# - -# Expand nd deal with NONE - just like configure will do later -OCDprefix=$prefix -OCDxprefix=$exec_prefix -test x"$OCDprefix" = xNONE && OCDprefix=$ac_default_prefix -# Let make expand exec_prefix. -test x"$OCDxprefix" = xNONE && OCDxprefix="$OCDprefix" - -# what matters is the "exec-prefix" -if test "$OCDxprefix" != "$ac_default_prefix" -then - # We are installing in a non-standard place - # Nonstandard --prefix and/or --exec-prefix - # We have an override of some sort. - # use build specific install library dir - - LDFLAGS="$LDFLAGS -L$OCDxprefix/lib" - # RPATH becomes an issue on Linux only - if test $host_os = linux-gnu || test $host_os = linux ; then - LDFLAGS="$LDFLAGS -Wl,-rpath,$OCDxprefix/lib" - fi - # The "INCDIR" is also usable - CFLAGS="$CFLAGS -I$includedir" -fi - AC_ARG_WITH(ftd2xx, AS_HELP_STRING([--with-ftd2xx=],[This option has been removed.]), [