diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2022-09-01 23:19:57 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2022-09-06 23:36:06 +0200 |
| commit | e69ff8c0323fdd2bd8367bca7d4412ea724dfafa (patch) | |
| tree | e619ea830c7ff7f4bcd9d6ca151504dde6908103 | |
| parent | 4f21b567f8cc99b11e6915bcb810a61b91c45a52 (diff) | |
| download | libgphoto2-e69ff8c0323fdd2bd8367bca7d4412ea724dfafa.tar.gz | |
Use LIBWS232_* with $(...) instead of @...@
| -rw-r--r-- | camlibs/lumix/Makefile-files | 3 | ||||
| -rw-r--r-- | camlibs/ptp2/Makefile-files | 3 | ||||
| -rw-r--r-- | configure.ac | 8 |
3 files changed, 9 insertions, 5 deletions
diff --git a/camlibs/lumix/Makefile-files b/camlibs/lumix/Makefile-files index f4676989a..2ce291405 100644 --- a/camlibs/lumix/Makefile-files +++ b/camlibs/lumix/Makefile-files @@ -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) diff --git a/camlibs/ptp2/Makefile-files b/camlibs/ptp2/Makefile-files index ce798a2b7..4ab8f584b 100644 --- a/camlibs/ptp2/Makefile-files +++ b/camlibs/ptp2/Makefile-files @@ -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) diff --git a/configure.ac b/configure.ac index 5f1674648..93dd34b0d 100644 --- a/configure.ac +++ b/configure.ac @@ -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" ]) ]) |