118569: Replace neon with serf (and prerequisites apr and apr-util).

Original author: orw@apache.org

3 files changed, 101 insertions, 2 deletions

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 2472d89faeda..f65121829e38 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1513,9 +1513,7 @@ File gid_File_Lib_Ucpchelp1
     Styles = (PACKED);
 End
 
-#ifdef SYSTEM_NEON
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
-#endif
 
 SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
 
@@ -2000,3 +1998,48 @@ End
 #endif
 #endif
 
+File gid_File_Lib_Apr
+     #ifdef WNT
+        Name = SPECIAL_NAME(libapr-1);
+     #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libapr-1,.0.,APR_MINOR,.,APR_MICRO,UNXSUFFIX));
+        #else
+            Name = STRING(CONCAT6(libapr-1,UNXSUFFIX,.0.,APR_MINOR,.,APR_MICRO));
+        #endif
+     #endif
+     PACKED_LIB_FILE_BODY;
+End
+
+File gid_File_Lib_AprUtil
+    #ifdef WNT
+        Name = SPECIAL_NAME(apr-util);
+    #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libaprutil-1,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO,UNXSUFFIX));
+	#else
+            Name = STRING(CONCAT6(libaprutil-1,UNXSUFFIX,.0.,APR_UTIL_MINOR,.,APR_UTIL_MICRO));
+	#endif
+    #endif
+    PACKED_LIB_FILE_BODY;
+End
+
+File gid_File_Lib_Serf
+    #ifdef WNT
+        Name = SPECIAL_NAME(serf);
+    #else
+	// Looks like the major version number is part of the name, not
+	// part of the suffix.  An error?
+	#ifdef MACOSX
+            Name = STRING(CONCAT6(libserf-1,.0.,SERF_MINOR,.,SERF_MICRO,UNXSUFFIX));
+	#else
+            Name = STRING(CONCAT6(libserf-1,UNXSUFFIX,.0.,SERF_MINOR,.,SERF_MICRO));
+	#endif
+    #endif
+    PACKED_LIB_FILE_BODY;
+End
+
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index e08d8201c461..8a1b9342b376 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -240,6 +240,21 @@ SCPDEFS+=-DOPENSSL
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
+# Detect version numbers for apr, apr-util, serf.
+.INCLUDE : apr_version.mk
+.INCLUDE : aprutil_version.mk
+.INCLUDE : serf_version.mk
+SCPDEFS+=\
+    -DAPR_MAJOR=$(APR_MAJOR)		\
+    -DAPR_MINOR=$(APR_MINOR)		\
+    -DAPR_MICRO=$(APR_MICRO)		\
+    -DAPR_UTIL_MAJOR=$(APR_UTIL_MAJOR)	\
+    -DAPR_UTIL_MINOR=$(APR_UTIL_MINOR)	\
+    -DAPR_UTIL_MICRO=$(APR_UTIL_MICRO)	\
+    -DSERF_MAJOR=$(SERF_MAJOR)		\
+    -DSERF_MINOR=$(SERF_MINOR)		\
+    -DSERF_MICRO=$(SERF_MICRO)
+
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 4bc88a7f2421..eb5717f59c00 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -90,4 +90,45 @@ End
 
 #endif
 
+#ifdef UNX
+
+// Create links to the fully quantified libraries apr, apr-util, and serf.
+// The major version number is handled in a non-standard way (part of the name).
+// Therefore the hard-coded .0 suffix.
+
+Shortcut gid_Shortcut_Lib_Apr
+    FileID = gid_File_Lib_Apr;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libapr-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libapr-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+Shortcut gid_Shortcut_Lib_AprUtil
+    FileID = gid_File_Lib_AprUtil;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libaprutil-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libaprutil-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+Shortcut gid_Shortcut_Lib_Serf
+    FileID = gid_File_Lib_Serf;
+    Dir = SCP2_OOO_BIN_DIR;
+    #ifdef MACOSX
+        Name = STRING(CONCAT2(libserf-1.0,UNXSUFFIX));
+    #else
+        Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0));
+    #endif
+    Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
+End
+
+#endif
+
 //i44154 -end-