Attachment 4596 Details for Bug 4960 – Prepend "$libreplacedir/" to all objects in LIBREPLACEOBJ

[patch] Prepend "$libreplacedir/" to all objects in LIBREPLACEOBJ

0001-Prepend-libreplacedir-to-all-objects-in-LIBREPLACEOB.patch (text/plain), 5.98 KB, created by Matt Kraai (mail address dead) on 2009-08-25 23:28:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Kraai (mail address dead)

Created: 2009-08-25 23:28:45 UTC

Size: 5.98 KB

patch

obsolete

>From 446177e8c9b51d3e3b8fa72f426f5bfb35361a7e Mon Sep 17 00:00:00 2001
>From: Matt Kraai <kraai@ftbfs.org>
>Date: Tue, 25 Aug 2009 21:19:52 -0700
>Subject: [PATCH] Prepend "$libreplacedir/" to all objects in LIBREPLACEOBJ
>
>---
> lib/replace/crypt.m4              |    2 +-
> lib/replace/dlfcn.m4              |    2 +-
> lib/replace/libreplace.m4         |    2 +-
> lib/replace/libreplace_network.m4 |   14 +++++++-------
> lib/replace/repdir.m4             |    4 ++--
> lib/replace/strptime.m4           |    2 +-
> lib/replace/timegm.m4             |    2 +-
> 7 files changed, 14 insertions(+), 14 deletions(-)
>
>diff --git a/lib/replace/crypt.m4 b/lib/replace/crypt.m4
>index 684c351..fae2a58 100644
>--- a/lib/replace/crypt.m4
>+++ b/lib/replace/crypt.m4
>@@ -3,4 +3,4 @@
> AC_CHECK_HEADERS(crypt.h)
> AC_SEARCH_LIBS_EXT(crypt, [crypt], CRYPT_LIBS,
>   [ AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function]) ],
>-  [ LIBREPLACEOBJ="${LIBREPLACEOBJ} crypt.o" ])
>+  [ LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/crypt.o" ])
>diff --git a/lib/replace/dlfcn.m4 b/lib/replace/dlfcn.m4
>index 42f56f2..722e024 100644
>--- a/lib/replace/dlfcn.m4
>+++ b/lib/replace/dlfcn.m4
>@@ -23,7 +23,7 @@ AC_VERIFY_C_PROTOTYPE([void *dlopen(const char* filename, unsigned int flags)],
> 	])
> 
> if test x"${libreplace_cv_dlfcn}" = x"yes";then
>-	LIBREPLACEOBJ="${LIBREPLACEOBJ} dlfcn.o"
>+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/dlfcn.o"
> fi
> 
> LIBDL="$LIBS"
>diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
>index 7815901..af85879 100644
>--- a/lib/replace/libreplace.m4
>+++ b/lib/replace/libreplace.m4
>@@ -16,7 +16,7 @@ done
> if test x"$libreplacedir" = "x"; then
> 	AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
> fi
>-LIBREPLACEOBJ="replace.o"
>+LIBREPLACEOBJ="$libreplacedir/replace.o"
> AC_SUBST(LIBREPLACEOBJ)
> 
> AC_CANONICAL_BUILD
>diff --git a/lib/replace/libreplace_network.m4 b/lib/replace/libreplace_network.m4
>index 2af0231..b7d15ea 100644
>--- a/lib/replace/libreplace_network.m4
>+++ b/lib/replace/libreplace_network.m4
>@@ -173,7 +173,7 @@ LIBS="${LIBREPLACE_NETWORK_LIBS}"
> libreplace_SAVE_CPPFLAGS="$CPPFLAGS"
> CPPFLAGS="$CPPFLAGS -I$libreplacedir"
> 
>-AC_CHECK_FUNCS(socketpair,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} socketpair.o"])
>+AC_CHECK_FUNCS(socketpair,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/socketpair.o"])
> 
> AC_CACHE_CHECK([for broken inet_ntoa],libreplace_cv_REPLACE_INET_NTOA,[
> AC_TRY_RUN([
>@@ -193,14 +193,14 @@ exit(1);}],
> AC_CHECK_FUNCS(inet_ntoa,[],[libreplace_cv_REPLACE_INET_NTOA=yes])
> if test x"$libreplace_cv_REPLACE_INET_NTOA" = x"yes"; then
>     AC_DEFINE(REPLACE_INET_NTOA,1,[Whether inet_ntoa should be replaced])
>-    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntoa.o"
>+    LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntoa.o"
> fi
> 
>-AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_aton.o"])
>+AC_CHECK_FUNCS(inet_aton,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_aton.o"])
> 
>-AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_ntop.o"])
>+AC_CHECK_FUNCS(inet_ntop,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_ntop.o"])
> 
>-AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} inet_pton.o"])
>+AC_CHECK_FUNCS(inet_pton,[],[LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/inet_pton.o"])
> 
> dnl test for getaddrinfo/getnameinfo
> AC_CACHE_CHECK([for getaddrinfo],libreplace_cv_HAVE_GETADDRINFO,[
>@@ -232,7 +232,7 @@ if test x"$libreplace_cv_HAVE_GETADDRINFO" = x"yes"; then
> 	AC_DEFINE(HAVE_FREEADDRINFO,1,[Whether the system has freeaddrinfo])
> 	AC_DEFINE(HAVE_GAI_STRERROR,1,[Whether the system has gai_strerror])
> else
>-	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getaddrinfo.o"
>+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getaddrinfo.o"
> fi
> 
> AC_CHECK_HEADERS([ifaddrs.h])
>@@ -287,7 +287,7 @@ AC_TRY_RUN([
> if test x"$libreplace_cv_HAVE_IFACE_GETIFADDRS" = x"yes"; then
>     iface=yes;AC_DEFINE(HAVE_IFACE_GETIFADDRS,1,[Whether iface getifaddrs is available])
> else
>-	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} getifaddrs.o"
>+	LIBREPLACE_NETWORK_OBJS="${LIBREPLACE_NETWORK_OBJS} $libreplacedir/getifaddrs.o"
> fi
> 
> 
>diff --git a/lib/replace/repdir.m4 b/lib/replace/repdir.m4
>index fb3f414..682ab44 100644
>--- a/lib/replace/repdir.m4
>+++ b/lib/replace/repdir.m4
>@@ -45,7 +45,7 @@ fi
> if test x"$libreplace_cv_READDIR_GETDIRENTRIES" = x"yes"; then
> 	AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
> 	AC_DEFINE(REPLACE_READDIR_GETDIRENTRIES,1,[replace readdir using getdirentries()])
>-	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdirentries.o"
>+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdirentries.o"
> 	libreplace_cv_READDIR_NEEDED=no
> fi
> 
>@@ -68,7 +68,7 @@ fi
> if test x"$libreplace_cv_READDIR_GETDENTS" = x"yes"; then
> 	AC_DEFINE(REPLACE_READDIR,1,[replace readdir])
> 	AC_DEFINE(REPLACE_READDIR_GETDENTS,1,[replace readdir using getdents()])
>-	LIBREPLACEOBJ="${LIBREPLACEOBJ} repdir_getdents.o"
>+	LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/repdir_getdents.o"
> 	libreplace_cv_READDIR_NEEDED=no
> fi
> 
>diff --git a/lib/replace/strptime.m4 b/lib/replace/strptime.m4
>index da22fc5..b1a56b4 100644
>--- a/lib/replace/strptime.m4
>+++ b/lib/replace/strptime.m4
>@@ -9,5 +9,5 @@ AC_CACHE_CHECK([whether strptime is available and works],libreplace_cv_STRPTIME_
> ])
> if test x"$libreplace_cv_STRPTIME_OK" != x"yes"; then
>         AC_DEFINE(REPLACE_STRPTIME,1,[Whether strptime should be replaced])
>-        LIBREPLACEOBJ="${LIBREPLACEOBJ} strptime.o"
>+        LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/strptime.o"
> fi
>diff --git a/lib/replace/timegm.m4 b/lib/replace/timegm.m4
>index 59f3ae0..9b76d0c 100644
>--- a/lib/replace/timegm.m4
>+++ b/lib/replace/timegm.m4
>@@ -1 +1 @@
>-AC_CHECK_FUNCS(timegm,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} timegm.o"])
>+AC_CHECK_FUNCS(timegm,[],[LIBREPLACEOBJ="${LIBREPLACEOBJ} $libreplacedir/timegm.o"])
>-- 
>1.6.3.3
>

Flags:

metze: review-

Actions: View

Attachments on bug 4960: 2920 | 4366 | 4385 | 4386 | 4387 | 4596 | 4599 | 4662