/[gtktalog]/gtktalog/m4/lib-link.m4
ViewVC logotype

Diff of /gtktalog/m4/lib-link.m4

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1 by ymettier, Sun Oct 13 16:24:04 2002 UTC revision 1.2 by chevdor, Tue Oct 28 22:34:47 2003 UTC
# Line 1  Line 1 
1  # lib-link.m4 serial 2 (gettext-0.11.2)  # lib-link.m4 serial 3 (gettext-0.11.3)
2  dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.  dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
3  dnl This file is free software, distributed under the terms of the GNU  dnl This file is free software, distributed under the terms of the GNU
4  dnl General Public License.  As a special exception to the GNU General  dnl General Public License.  As a special exception to the GNU General
# Line 116  AC_DEFUN([AC_LIB_RPATH], Line 116  AC_DEFUN([AC_LIB_RPATH],
116    hardcode_minus_L="$acl_cv_hardcode_minus_L"    hardcode_minus_L="$acl_cv_hardcode_minus_L"
117    sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"    sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
118    sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"    sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
119      dnl Determine whether the user wants rpath handling at all.
120      AC_ARG_ENABLE(rpath,
121        [  --disable-rpath         do not hardcode runtime library paths],
122        :, enable_rpath=yes)
123  ])  ])
124    
125  dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and  dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
# Line 245  AC_DEFUN([AC_LIB_LINKFLAGS_BODY], Line 249  AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
249                dnl Linking with a shared library. We attempt to hardcode its                dnl Linking with a shared library. We attempt to hardcode its
250                dnl directory into the executable's runpath, unless it's the                dnl directory into the executable's runpath, unless it's the
251                dnl standard /usr/lib.                dnl standard /usr/lib.
252                if test "X$found_dir" = "X/usr/lib"; then                if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
253                  dnl No hardcoding is needed.                  dnl No hardcoding is needed.
254                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
255                else                else
# Line 436  AC_DEFUN([AC_LIB_LINKFLAGS_BODY], Line 440  AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
440                      ;;                      ;;
441                    -R*)                    -R*)
442                      dir=`echo "X$dep" | sed -e 's/^X-R//'`                      dir=`echo "X$dep" | sed -e 's/^X-R//'`
443                      dnl Potentially add DIR to rpathdirs.                      if test "$enable_rpath" != no; then
444                      dnl The rpathdirs will be appended to $LIBNAME at the end.                        dnl Potentially add DIR to rpathdirs.
445                      haveit=                        dnl The rpathdirs will be appended to $LIBNAME at the end.
446                      for x in $rpathdirs; do                        haveit=
447                        if test "X$x" = "X$dir"; then                        for x in $rpathdirs; do
448                          haveit=yes                          if test "X$x" = "X$dir"; then
449                          break                            haveit=yes
450                              break
451                            fi
452                          done
453                          if test -z "$haveit"; then
454                            rpathdirs="$rpathdirs $dir"
455                        fi                        fi
456                      done                        dnl Potentially add DIR to ltrpathdirs.
457                      if test -z "$haveit"; then                        dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
458                        rpathdirs="$rpathdirs $dir"                        haveit=
459                      fi                        for x in $ltrpathdirs; do
460                      dnl Potentially add DIR to ltrpathdirs.                          if test "X$x" = "X$dir"; then
461                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.                            haveit=yes
462                      haveit=                            break
463                      for x in $ltrpathdirs; do                          fi
464                        if test "X$x" = "X$dir"; then                        done
465                          haveit=yes                        if test -z "$haveit"; then
466                          break                          ltrpathdirs="$ltrpathdirs $dir"
467                        fi                        fi
                     done  
                     if test -z "$haveit"; then  
                       ltrpathdirs="$ltrpathdirs $dir"  
468                      fi                      fi
469                      ;;                      ;;
470                    -l*)                    -l*)

Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26