diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-26 12:22:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:00 -0500 |
| commit | 0d5587b5d128d9dd502a3b78c02fb986b33d92c4 (patch) | |
| tree | d5165c0eaf4424edaefca4422319afe84d4c7852 /source4/lib/socket | |
| parent | 7ffe0fcaee413de96ec9c3d4fdeaab6c2f106578 (diff) | |
| download | samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.tar.gz samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.tar.bz2 samba-0d5587b5d128d9dd502a3b78c02fb986b33d92c4.zip | |
r15274: Drop default EXT_LIB_ prefix for external libraries. Fixes issues with local
(empty) libpopt.a overriding global one
(This used to be commit 2f06305e53478e5030c24550954f221a9a97c83f)
Diffstat (limited to 'source4/lib/socket')
| -rw-r--r-- | source4/lib/socket/config.m4 | 4 | ||||
| -rw-r--r-- | source4/lib/socket/config.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4 index 4f76f3b6d4..45e5406f0c 100644 --- a/source4/lib/socket/config.m4 +++ b/source4/lib/socket/config.m4 @@ -22,7 +22,7 @@ if test x"$ac_cv_func_connect" = x"no"; then AC_CHECK_LIB_EXT(nsl, SOCKET_LIBS, connect) AC_CHECK_LIB_EXT(socket, SOCKET_LIBS, connect) AC_CHECK_LIB_EXT(inet, SOCKET_LIBS, connect) - SMB_EXT_LIB_ENABLE(SOCKET,YES) + SMB_ENABLE(EXT_SOCKET,YES) dnl We can't just call AC_CHECK_FUNCS(connect) here, because the value dnl has been cached. if test x"$ac_cv_lib_ext_nsl_s_connect" = x"yes" || @@ -35,7 +35,7 @@ if test x"$ac_cv_func_connect" = x"no"; then fi fi -SMB_EXT_LIB(SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}]) +SMB_EXT_LIB(EXT_SOCKET,[${SOCKET_LIBS}],[${SOCKET_CFLAGS}],[${SOCKET_CPPFLAGS}],[${SOCKET_LDFLAGS}]) ############################################ # check for unix domain sockets diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index fe4e00eedf..d56539b808 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -6,7 +6,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv4.o -PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_SOCKET # End MODULE socket_ipv4 ################################################ @@ -17,7 +17,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv6.o -PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_SOCKET # End MODULE socket_ipv6 ################################################ @@ -28,7 +28,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_unix.o -PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_SOCKET # End MODULE socket_unix ################################################ |