Make some --without-system-XXX available on Linux, too

...in case that should ever become uesful.

3 files changed, 64 insertions, 21 deletions

diff --git a/configure.in b/configure.in
index e6e1205089df..739ec3efd1e1 100644
--- a/configure.in
+++ b/configure.in
@@ -685,9 +685,12 @@ AC_ARG_ENABLE(cairo-canvas,
 ],,enable_cairo_canvas=yes)
 
 AC_ARG_ENABLE(librsvg,
-    AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal>],
+    AS_HELP_STRING([--enable-librsvg=<no/auto/system/internal/fully-internal>],
         [Enables or disables use of librsvg to render SVG at run-time.
-         Also specificed what librsvg to use. 'auto' is the default.]))
+         Also specificed what librsvg to use. 'auto' is the default.
+         'fully-internal' also forces internal versions of libraries (only)
+         librsvg depends on (currently GLib, gdk-pixbuf, libcroco, libgsf,
+         pango).]))
 
 AC_ARG_ENABLE(opengl,
     AS_HELP_STRING([--disable-opengl],
@@ -9740,6 +9743,10 @@ internal)
     AC_MSG_RESULT([internal])
     ;;
 
+fully-internal)
+    AC_MSG_RESULT([fully internal])
+    ;;
+
 system)
     if test $_os = WINNT -a "$WITH_MINGW" != yes; then
         AC_MSG_ERROR([Must use internal librsvg when building with MSVC])
@@ -9753,14 +9760,15 @@ system)
     ;;
 esac
 
-dnl By now enable_librsvg should be "system", "internal" or "no"
+dnl By now enable_librsvg should be "system", "internal", "fully-internal", or
+dnl "no":
 case $enable_librsvg in
 system)
     ENABLE_LIBRSVG=SYSTEM
     SYSTEM_LIBRSVG=YES
     ;;
 
-internal)
+internal|fully-internal)
     ENABLE_LIBRSVG=INTERNAL
     SYSTEM_LIBRSVG=NO
     BUILD_TYPE="$BUILD_TYPE LIBRSVG"
@@ -9845,6 +9853,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
     SYSTEM_GDKPIXBUF=YES
     AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+    SYSTEM_GDKPIXBUF=NO
+    AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
@@ -9872,6 +9883,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
     SYSTEM_GLIB=YES
     AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+    SYSTEM_GLIB=NO
+    AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
@@ -9893,21 +9907,25 @@ dnl ===================================================================
 
 AC_MSG_CHECKING([whether to use the system gettext runtime])
 
-if test "$with_system_gettext" = yes; then
-    SYSTEM_GETTEXT=YES
-    AC_MSG_RESULT([yes])
-else
+if test -z "$with_system_gettext"; then
     case "$_os" in
     WINNT|Darwin|iOS|Android)
-        SYSTEM_GETTEXT=NO
-        AC_MSG_RESULT([no])
+        with_system_gettext=no
         ;;
     *)
-        SYSTEM_GETTEXT=YES
-        AC_MSG_RESULT([yes])
+        with_system_gettext=yes
         ;;
     esac
 fi
+if test "$with_system_gettext" = yes; then
+    SYSTEM_GETTEXT=YES
+    AC_MSG_RESULT([yes])
+elif test "$with_system_gettext" = no; then
+    SYSTEM_GETTEXT=NO
+    AC_MSG_RESULT([yes])
+else
+    AC_MSG_ERROR([bad --with-system-gettext=$with_system_gettext])
+fi
 AC_SUBST(SYSTEM_GETTEXT)
 
 dnl ===================================================================
@@ -9923,6 +9941,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
     SYSTEM_LIBCROCO=YES
     AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+    SYSTEM_LIBCROCO=NO
+    AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
@@ -9950,6 +9971,9 @@ dnl by --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
     SYSTEM_PANGO=YES
     AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+    SYSTEM_PANGO=NO
+    AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
@@ -9977,6 +10001,9 @@ dnl --with-system-libs) to override this.
 if test "$SYSTEM_LIBRSVG" = YES; then
     SYSTEM_LIBGSF=YES
     AC_MSG_RESULT([yes])
+elif test "$enable_librsvg" = fully-internal; then
+    SYSTEM_LIBGSF=NO
+    AC_MSG_RESULT([no])
 else
     case "$_os" in
     WINNT|Darwin|iOS|Android)
diff --git a/glib/makefile.mk b/glib/makefile.mk
index 1b31d395eab6..0efb7ec3b665 100644
--- a/glib/makefile.mk
+++ b/glib/makefile.mk
@@ -48,7 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(GLIBVERSION)
 TARFILE_MD5=9f6e85e1e38490c3956f4415bcd33e6e
 
 
-.IF "$(OS)"=="MACOSX" || "$(OS)"=="IOS"
+.IF "$(OS)"!="WNT"
 PATCH_FILES=glib-2.28.1.patch glib-2.28.1.noise.patch
 
 .IF "$(OS)"=="IOS"
@@ -91,21 +91,27 @@ VFLAG=V=1
 
 BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) $(VFLAG) -j$(MAXPROCESS)
 
-.IF "$(OS)"=="MACOSX"
+.IF "$(OS)"!="IOS"
 
 EXTRPATH=LOADER
 
-OUT2LIB+=gio/.libs/libgio-2.0.0.dylib
-OUT2LIB+=glib/.libs/libglib-2.0.0.dylib
-OUT2LIB+=gmodule/.libs/libgmodule-2.0.0.dylib
-OUT2LIB+=gobject/.libs/libgobject-2.0.0.dylib
-OUT2LIB+=gthread/.libs/libgthread-2.0.0.dylib
+.IF "$(OS)" == "MACOSX"
+my_ext = .0$(DLLPOST)
+.ELSE
+my_ext = $(DLLPOST).0
+.END
+
+OUT2LIB+=gio/.libs/libgio-2.0$(my_ext)
+OUT2LIB+=glib/.libs/libglib-2.0$(my_ext)
+OUT2LIB+=gmodule/.libs/libgmodule-2.0$(my_ext)
+OUT2LIB+=gobject/.libs/libgobject-2.0$(my_ext)
+OUT2LIB+=gthread/.libs/libgthread-2.0$(my_ext)
 
 OUT2BIN+=gobject/glib-mkenums
 OUT2BIN+=gobject/.libs/glib-genmarshal
 OUT2BIN+=gio/.libs/glib-compile-schemas
 
-.ELIF "$(OS)"=="IOS"
+.ELSE
 
 OUT2LIB+=gio/.libs/libgio-2.0.a
 OUT2LIB+=glib/.libs/libglib-2.0.a
@@ -115,7 +121,7 @@ OUT2LIB+=gthread/.libs/libgthread-2.0.a
 
 .ENDIF
 
-.ELIF "$(OS)"=="WNT"
+.ELSE
 
 CONVERTFILES=gobject/gmarshal.c
 
diff --git a/glib/prj/d.lst b/glib/prj/d.lst
index 751d5c65b295..7e4ab84c5199 100644
--- a/glib/prj/d.lst
+++ b/glib/prj/d.lst
@@ -9,6 +9,16 @@ symlink: %_DEST%\lib\libgthread-2.0.0.dylib %_DEST%\lib\libgthread-2.0.dylib
 symlink: %_DEST%\lib\libglib-2.0.0.dylib %_DEST%\lib\libglib-2.0.dylib
 ..\%__SRC%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.0.dylib
 symlink: %_DEST%\lib\libgobject-2.0.0.dylib %_DEST%\lib\libgobject-2.0.dylib
+..\%__SRC%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so.0
+symlink: %_DEST%\lib\libgio-2.0.so.0 %_DEST%\lib\libgio-2.0.so
+..\%__SRC%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so.0
+symlink: %_DEST%\lib\libgmodule-2.0.so.0 %_DEST%\lib\libgmodule-2.0.so
+..\%__SRC%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so.0
+symlink: %_DEST%\lib\libgthread-2.0.so.0 %_DEST%\lib\libgthread-2.0.so
+..\%__SRC%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so.0
+symlink: %_DEST%\lib\libglib-2.0.so.0 %_DEST%\lib\libglib-2.0.so
+..\%__SRC%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so.0
+symlink: %_DEST%\lib\libgobject-2.0.so.0 %_DEST%\lib\libgobject-2.0.so
 ..\%__SRC%\bin\*.dll %_DEST%\bin
 ..\%__SRC%\bin\glib-mkenums %_DEST%\bin\glib-mkenums
 ..\%__SRC%\bin\glib-genmarshal %_DEST%\bin\glib-genmarshal