Module: wine Branch: master Commit: ded44ed947bc8765abecb796e41dc4a2cd24e0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded44ed947bc8765abecb796e4...
Author: Alexandre Julliard julliard@winehq.org Date: Thu Oct 22 19:33:27 2015 +0900
configure: Follow the variable naming convention for libpcap.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
configure | 5 +++-- configure.ac | 2 +- dlls/wpcap/Makefile.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/configure b/configure index f21a860..83b7c32 100755 --- a/configure +++ b/configure @@ -677,7 +677,7 @@ XSLT_LIBS XSLT_CFLAGS XML2_LIBS XML2_CFLAGS -LIBPCAP +PCAP_LIBS X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -10941,7 +10941,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcap_pcap_create" >&5 $as_echo "$ac_cv_lib_pcap_pcap_create" >&6; } if test "x$ac_cv_lib_pcap_pcap_create" = xyes; then : - LIBPCAP="-lpcap" + PCAP_LIBS="-lpcap"
fi
@@ -17127,6 +17127,7 @@ X_CFLAGS = $X_CFLAGS X_PRE_LIBS = $X_PRE_LIBS X_LIBS = $X_LIBS X_EXTRA_LIBS = $X_EXTRA_LIBS +PCAP_LIBS = $PCAP_LIBS XML2_CFLAGS = $XML2_CFLAGS XML2_LIBS = $XML2_LIBS XSLT_CFLAGS = $XSLT_CFLAGS diff --git a/configure.ac b/configure.ac index a209fa1..a494266 100644 --- a/configure.ac +++ b/configure.ac @@ -1289,7 +1289,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op dnl **** Check for libpcap **** if test "$ac_cv_header_pcap_pcap_h" = "yes" then - AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(LIBPCAP,["-lpcap"])]) + AC_CHECK_LIB(pcap,pcap_create,[AC_SUBST(PCAP_LIBS,["-lpcap"])]) fi WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_create" != xyes], [pcap ${notice_platform}development files not found, wpcap won't be supported.]) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index e44613f..91b4a95 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -1,6 +1,6 @@ MODULE = wpcap.dll DELAYIMPORTS = ws2_32 -EXTRALIBS = @LIBPCAP@ +EXTRALIBS = $(PCAP_LIBS)
C_SRCS = \ wpcap.c