darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use LIBWS232_* with $(...) instead of @...@

Browse Source
This commit is contained in:
Hans Ulrich Niedermann
2022-09-01 23:19:57 +02:00
parent 4f21b567f8
commit e69ff8c032
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
camlibs/lumix/Makefile-files
View File

@@ -22,4 +22,5 @@ lumix_la_LIBADD += $(LIBCURL_LIBS)
lumix_la_CFLAGS += $(LIBXML2_CFLAGS)
lumix_la_LIBADD += $(LIBXML2_LIBS)
lumix_la_LIBADD += @LIBWS232@
lumix_la_CFLAGS += $(LIBWS232_CFLAGS)
lumix_la_LIBADD += $(LIBWS232_LIBS)

3
camlibs/ptp2/Makefile-files
View File

@@ -49,4 +49,5 @@ ptp2_la_LIBADD += $(LIBXML2_LIBS)
ptp2_la_CPPFLAGS += $(LIBJPEG_CFLAGS)
ptp2_la_LIBADD += $(LIBJPEG_LIBS)
ptp2_la_LIBADD += @LIBWS232@
ptp2_la_CPPFLAGS += $(LIBWS232_CFLAGS)
ptp2_la_LIBADD += $(LIBWS232_LIBS)

8
configure.ac
View File

@@ -330,9 +330,11 @@ GP_LIBJPEG
dnl ---------------------------------------------------------------------------
dnl check for ws2_32
dnl ---------------------------------------------------------------------------
LIBWS232=""
LIBWS232_CFLAGS=""
LIBWS232_LIBS=""
libws232_msg="no"
AC_SUBST([LIBWS232])
AC_SUBST([LIBWS232_CFLAGS])
AC_SUBST([LIBWS232_LIBS])
AC_ARG_WITH([ws232],
[AS_HELP_STRING([--without-ws232],
[Build without ws2_32 library (default: no)])])
@@ -341,7 +343,7 @@ AS_IF([test "x$with_ws232" != "xno"], [dnl
AC_CHECK_HEADER([winsock.h], [dnl
AC_DEFINE([HAVE_LIBWS232], [1],
[define if we found LIBWS232 and its headers])
LIBWS232="-lws2_32"
LIBWS232_LIBS="-lws2_32"
libws232_msg="yes"
])
])