From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Thu, 5 May 2022 11:39:35 +0000 (-0400)
Subject: It is just <fcntl.h>, don't use legacy (non-POSIX) path that is still supported
X-Git-Tag: v2.4.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25de52409a780b71c9a21744a22beff62ebf46a9;p=thirdparty%2Fcups.git

It is just <fcntl.h>, don't use legacy (non-POSIX) path that is still supported
by most Unix platforms, but not all.

(this also makes the code consistent with usage everywhere else in the CUPS
code base)

Fixes: 388
---

diff --git a/CHANGES.md b/CHANGES.md
index 20743a577f..b254bc57c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,7 @@ Changes in CUPS v2.4.2 (TBA)
 - Updated the configure script to look for the OpenSSL library the old way if
   pkg-config is not available (Issue #375)
 - Fixed the prototype for the `httpWriteResponse` function (Issue #380)
+- Brought back minimal AIX support (Issue #389)
 - `cupsGetResponse` did not always set the last error.
 - Fixed a number of old references to the Apple CUPS web page.
 - Restored the default/generic printer icon file for the web interface.
diff --git a/configure b/configure
index 7934a82798..2e9c426bef 100755
--- a/configure
+++ b/configure
@@ -7720,6 +7720,20 @@ fi
 	DSOXX="\$(CXX)"
 	DSOFLAGS="$DSOFLAGS -Wl,-no_warn_inits -dynamiclib -single_module -lc"
      ;; #(
+  aix*) :
+
+	LIBCUPS="lib$cupsbase.so.2"
+	if test "x$cupsimagebase" != x
+then :
+
+	    LIBCUPSIMAGE="lib$cupsimagebase.so.2"
+
+fi
+	DSO="\$(CC)"
+	DSOXX="\$(CXX)"
+	DSOFLAGS="$DSOFLAGS -Wl,-G -o \`basename \$@\`
+	LDFLAGS="$LDFLAGS $TLSFLAGS -liconv -lz -lm"
+     ;; #(
   *) :
 
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: Warning: Shared libraries may not work, trying -shared option." >&5
diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index e3d43af67c..f819a6a8c2 100644
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -27,10 +27,10 @@
 #endif /* !CUPS_LITE */
 
 #include <limits.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #ifdef _WIN32
-#  include <fcntl.h>
 #  include <io.h>
 #  include <process.h>
 #  define WEXITSTATUS(s) (s)
@@ -41,7 +41,6 @@ typedef ULONG nfds_t;
 extern char **environ;
 
 #  include <spawn.h>
-#  include <sys/fcntl.h>
 #  include <sys/wait.h>
 #  include <poll.h>
 #endif /* _WIN32 */