/[cvs]/ccvs/m4/lib-prefix.m4
ViewVC logotype

Diff of /ccvs/m4/lib-prefix.m4

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

revision 1.3 by dprice, Tue Mar 1 18:15:07 2005 UTC revision 1.4 by dprice, Sun Sep 4 05:58:36 2005 UTC
# Line 1  Line 1 
1  # lib-prefix.m4 serial 4 (gettext-0.14.2)  # lib-prefix.m4 serial 5 (gettext-0.15)
2  dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.  dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
3  dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
4  dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
# Line 24  AC_DEFUN([AC_LIB_PREFIX], Line 24  AC_DEFUN([AC_LIB_PREFIX],
24    AC_BEFORE([$0], [AC_LIB_LINKFLAGS])    AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
25    AC_REQUIRE([AC_PROG_CC])    AC_REQUIRE([AC_PROG_CC])
26    AC_REQUIRE([AC_CANONICAL_HOST])    AC_REQUIRE([AC_CANONICAL_HOST])
27      AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
28    AC_REQUIRE([AC_LIB_PREPARE_PREFIX])    AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
29    dnl By default, look in $includedir and $libdir.    dnl By default, look in $includedir and $libdir.
30    use_additional=yes    use_additional=yes
# Line 45  AC_DEFUN([AC_LIB_PREFIX], Line 46  AC_DEFUN([AC_LIB_PREFIX],
46          ])          ])
47        else        else
48          additional_includedir="$withval/include"          additional_includedir="$withval/include"
49          additional_libdir="$withval/lib"          additional_libdir="$withval/$acl_libdirstem"
50        fi        fi
51      fi      fi
52  ])  ])
# Line 87  AC_DEFUN([AC_LIB_PREFIX], Line 88  AC_DEFUN([AC_LIB_PREFIX],
88      dnl   2. if it's already present in $LDFLAGS,      dnl   2. if it's already present in $LDFLAGS,
89      dnl   3. if it's /usr/local/lib and we are using GCC on Linux,      dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
90      dnl   4. if it doesn't exist as a directory.      dnl   4. if it doesn't exist as a directory.
91      if test "X$additional_libdir" != "X/usr/lib"; then      if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
92        haveit=        haveit=
93        for x in $LDFLAGS; do        for x in $LDFLAGS; do
94          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
# Line 97  AC_DEFUN([AC_LIB_PREFIX], Line 98  AC_DEFUN([AC_LIB_PREFIX],
98          fi          fi
99        done        done
100        if test -z "$haveit"; then        if test -z "$haveit"; then
101          if test "X$additional_libdir" = "X/usr/local/lib"; then          if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
102            if test -n "$GCC"; then            if test -n "$GCC"; then
103              case $host_os in              case $host_os in
104                linux*) haveit=yes;;                linux*) haveit=yes;;
# Line 151  AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], Line 152  AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
152    exec_prefix="$acl_save_exec_prefix"    exec_prefix="$acl_save_exec_prefix"
153    prefix="$acl_save_prefix"    prefix="$acl_save_prefix"
154  ])  ])
155    
156    dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
157    dnl the basename of the libdir, either "lib" or "lib64".
158    AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
159    [
160      dnl There is no formal standard regarding lib and lib64. The current
161      dnl practice is that on a system supporting 32-bit and 64-bit instruction
162      dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
163      dnl libraries go under $prefix/lib. We determine the compiler's default
164      dnl mode by looking at the compiler's library search path. If at least
165      dnl of its elements ends in /lib64 or points to a directory whose absolute
166      dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
167      dnl default, namely "lib".
168      acl_libdirstem=lib
169      searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
170      if test -n "$searchpath"; then
171        acl_save_IFS="${IFS=        }"; IFS=":"
172        for searchdir in $searchpath; do
173          if test -d "$searchdir"; then
174            case "$searchdir" in
175              */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
176              *) searchdir=`cd "$searchdir" && pwd`
177                 case "$searchdir" in
178                   */lib64 ) acl_libdirstem=lib64 ;;
179                 esac ;;
180            esac
181          fi
182        done
183        IFS="$acl_save_IFS"
184      fi
185    ])

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

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