Don't define LTDL_SHLIBPATH_VAR.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183771 91177308-0d34-0410-b5e6-96231b3b80d8

7 files changed, 2 insertions, 80 deletions

diff --git a/autoconf/m4/ltdl.m4 b/autoconf/m4/ltdl.m4
index 407a16e2d6..0a36dbe7c5 100644
--- a/autoconf/m4/ltdl.m4
+++ b/autoconf/m4/ltdl.m4
@@ -68,7 +68,6 @@ AC_REQUIRE([AC_HEADER_DIRENT])
 AC_REQUIRE([_LT_AC_CHECK_DLFCN])
 AC_REQUIRE([AC_LTDL_ENABLE_INSTALL])
 AC_REQUIRE([AC_LTDL_SHLIBEXT])
-AC_REQUIRE([AC_LTDL_SHLIBPATH])
 AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])
 AC_REQUIRE([AC_LTDL_OBJDIR])
 AC_REQUIRE([AC_LTDL_DLPREOPEN])
@@ -206,20 +205,6 @@ if test -n "$libltdl_cv_shlibext"; then
 fi
 ])# AC_LTDL_SHLIBEXT
 
-
-# AC_LTDL_SHLIBPATH
-# -----------------
-AC_DEFUN([AC_LTDL_SHLIBPATH],
-[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-AC_CACHE_CHECK([which variable specifies run-time library path],
-  [libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"])
-if test -n "$libltdl_cv_shlibpath_var"; then
-  AC_DEFINE_UNQUOTED([LTDL_SHLIBPATH_VAR], ["$libltdl_cv_shlibpath_var"],
-    [Define to the name of the environment variable that determines the dynamic library search path.])
-fi
-])# AC_LTDL_SHLIBPATH
-
-
 # AC_LTDL_SYSSEARCHPATH
 # ---------------------
 AC_DEFUN([AC_LTDL_SYSSEARCHPATH],
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake
index 7f8c48d3aa..5b6172321d 100755
--- a/cmake/config-ix.cmake
+++ b/cmake/config-ix.cmake
@@ -416,7 +416,6 @@ endif( MINGW )
 
 if( MSVC )
   set(error_t int)
-  set(LTDL_SHLIBPATH_VAR "PATH")
   set(LTDL_SYSSEARCHPATH "")
   set(LTDL_DLOPEN_DEPLIBS 1)
   set(SHLIBEXT ".lib")
@@ -427,7 +426,6 @@ if( MSVC )
   set(stricmp "_stricmp")
   set(strdup "_strdup")
 else( MSVC )
-  set(LTDL_SHLIBPATH_VAR "LD_LIBRARY_PATH")
   set(LTDL_SYSSEARCHPATH "") # TODO
   set(LTDL_DLOPEN_DEPLIBS 0)  # TODO
 endif( MSVC )
diff --git a/configure b/configure
index 5c4aa0bb68..ef6d92fe3b 100755
--- a/configure
+++ b/configure
@@ -9397,24 +9397,6 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibpath_var+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  libltdl_cv_shlibpath_var="$shlibpath_var"
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
-if test -n "$libltdl_cv_shlibpath_var"; then
-
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIBPATH_VAR "$libltdl_cv_shlibpath_var"
-_ACEOF
-
-fi
-
-
 { echo "$as_me:$LINENO: checking for the default library search path" >&5
 echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
 if test "${libltdl_cv_sys_search_path+set}" = set; then
@@ -10536,7 +10518,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10539 "configure"
+#line 10521 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11125,7 +11107,6 @@ done
 
 
 
-
 for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
 		  stdio.h unistd.h
 do
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index 8db74bfb97..d27fcdead9 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -676,10 +676,6 @@
    */
 #undef LTDL_OBJDIR
 
-/* Define to the name of the environment variable that determines the dynamic
-   library search path. */
-#cmakedefine LTDL_SHLIBPATH_VAR "${LTDL_SHLIBPATH_VAR}"
-
 /* Define to the extension used for shared libraries, say, ".so". */
 #cmakedefine LTDL_SHLIB_EXT "${LTDL_SHLIB_EXT}"
 
diff --git a/include/llvm/Config/config.h.in b/include/llvm/Config/config.h.in
index c14e735f3f..c3860b6e08 100644
--- a/include/llvm/Config/config.h.in
+++ b/include/llvm/Config/config.h.in
@@ -681,10 +681,6 @@
    */
 #undef LTDL_OBJDIR
 
-/* Define to the name of the environment variable that determines the dynamic
-   library search path. */
-#undef LTDL_SHLIBPATH_VAR
-
 /* Define to the extension used for shared libraries, say, ".so". */
 #undef LTDL_SHLIB_EXT
 
diff --git a/projects/sample/autoconf/m4/ltdl.m4 b/projects/sample/autoconf/m4/ltdl.m4
index 407a16e2d6..0a36dbe7c5 100644
--- a/projects/sample/autoconf/m4/ltdl.m4
+++ b/projects/sample/autoconf/m4/ltdl.m4
@@ -68,7 +68,6 @@ AC_REQUIRE([AC_HEADER_DIRENT])
 AC_REQUIRE([_LT_AC_CHECK_DLFCN])
 AC_REQUIRE([AC_LTDL_ENABLE_INSTALL])
 AC_REQUIRE([AC_LTDL_SHLIBEXT])
-AC_REQUIRE([AC_LTDL_SHLIBPATH])
 AC_REQUIRE([AC_LTDL_SYSSEARCHPATH])
 AC_REQUIRE([AC_LTDL_OBJDIR])
 AC_REQUIRE([AC_LTDL_DLPREOPEN])
@@ -206,20 +205,6 @@ if test -n "$libltdl_cv_shlibext"; then
 fi
 ])# AC_LTDL_SHLIBEXT
 
-
-# AC_LTDL_SHLIBPATH
-# -----------------
-AC_DEFUN([AC_LTDL_SHLIBPATH],
-[AC_REQUIRE([AC_LIBTOOL_SYS_DYNAMIC_LINKER])
-AC_CACHE_CHECK([which variable specifies run-time library path],
-  [libltdl_cv_shlibpath_var], [libltdl_cv_shlibpath_var="$shlibpath_var"])
-if test -n "$libltdl_cv_shlibpath_var"; then
-  AC_DEFINE_UNQUOTED([LTDL_SHLIBPATH_VAR], ["$libltdl_cv_shlibpath_var"],
-    [Define to the name of the environment variable that determines the dynamic library search path.])
-fi
-])# AC_LTDL_SHLIBPATH
-
-
 # AC_LTDL_SYSSEARCHPATH
 # ---------------------
 AC_DEFUN([AC_LTDL_SYSSEARCHPATH],
diff --git a/projects/sample/configure b/projects/sample/configure
index d41ba3dbae..8c522006a0 100755
--- a/projects/sample/configure
+++ b/projects/sample/configure
@@ -9223,24 +9223,6 @@ _ACEOF
 fi
 
 
-{ echo "$as_me:$LINENO: checking which variable specifies run-time library path" >&5
-echo $ECHO_N "checking which variable specifies run-time library path... $ECHO_C" >&6; }
-if test "${libltdl_cv_shlibpath_var+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  libltdl_cv_shlibpath_var="$shlibpath_var"
-fi
-{ echo "$as_me:$LINENO: result: $libltdl_cv_shlibpath_var" >&5
-echo "${ECHO_T}$libltdl_cv_shlibpath_var" >&6; }
-if test -n "$libltdl_cv_shlibpath_var"; then
-
-cat >>confdefs.h <<_ACEOF
-#define LTDL_SHLIBPATH_VAR "$libltdl_cv_shlibpath_var"
-_ACEOF
-
-fi
-
-
 { echo "$as_me:$LINENO: checking for the default library search path" >&5
 echo $ECHO_N "checking for the default library search path... $ECHO_C" >&6; }
 if test "${libltdl_cv_sys_search_path+set}" = set; then
@@ -10362,7 +10344,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10365 "configure"
+#line 10347 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10951,7 +10933,6 @@ done
 
 
 
-
 for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
 		  stdio.h unistd.h
 do