Don't define LTDL_SHLIBPATH_VAR.

llvm-svn: 183771
2013-06-11 19:04:13 +00:00 · 2013-06-11 19:04:13 +00:00 · d45b9f15f9
parent 8cc6dc26bb
commit d45b9f15f9
7 changed files with 2 additions and 80 deletions
--- a/llvm/autoconf/m4/ltdl.m4
+++ b/llvm/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],
--- a/llvm/cmake/config-ix.cmake
+++ b/llvm/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 )
--- a/llvm/configure
+++ b/llvm/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
@ -11123,7 +11105,6 @@ done



-


 for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \
--- a/llvm/include/llvm/Config/config.h.cmake
+++ b/llvm/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}"

--- a/llvm/include/llvm/Config/config.h.in
+++ b/llvm/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

--- a/llvm/projects/sample/autoconf/m4/ltdl.m4
+++ b/llvm/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],
--- a/llvm/projects/sample/configure
+++ b/llvm/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
@ -10949,7 +10931,6 @@ done



-


 for ac_header in assert.h ctype.h errno.h malloc.h memory.h stdlib.h \