[mapguide-commits] r10105 - branches/4.0/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2024-08-23 02:51:38 -0700 (Fri, 23 Aug 2024)
New Revision: 10105

Modified:
   branches/4.0/MgDev/cmake_bootstrap.sh
Log:
Update cmake_bootstrap.sh to support all-internal except for zlib, and to refine internal libpng build/install to only cover its static library

Modified: branches/4.0/MgDev/cmake_bootstrap.sh
===================================================================
--- branches/4.0/MgDev/cmake_bootstrap.sh	2024-08-23 09:50:00 UTC (rev 10104)
+++ branches/4.0/MgDev/cmake_bootstrap.sh	2024-08-23 09:51:38 UTC (rev 10105)
@@ -47,6 +47,9 @@
         --with-internal-zlib)
             INTERNAL_ZLIB=1
             ;;
+        --without-internal-zlib)
+            INTERNAL_ZLIB=0
+            ;;
         --with-internal-libpng)
             INTERNAL_LIBPNG=1
             ;;
@@ -212,15 +215,18 @@
     echo "Building libpng (internal)"
     cp -Rf "${SOURCE_DIR}/Oem/gd/lpng" "${OEM_WORK_DIR}/gd/lpng"
     cd "${OEM_WORK_DIR}/gd/lpng" || exit
-    cp scripts/makefile.std makefile
+    cp scripts/makefile.linux makefile
     if [ $BUILD_CPU -eq 64 ]; then
         #Inject -fPIC to CFLAGS for 64-bit
         sed 's/^CFLAGS=/CFLAGS= -fPIC -m64 /g' makefile > makefile64
         make -fmakefile64
-        make -fmakefile64 install
         check_build
+        make -fmakefile64 install-static
+        check_build
+        make -fmakefile64 install-config
+        check_build
     else
-        make && make install
+        make && make install-static && make install-config
         check_build
     fi
 fi