1. mst
  2. ooo340

Commits

Kurt Zenker  committed 21b55c1

masterfix OOO340: #i117770# use system libs if not ENABLE_LIBRSVG

  • Participants
  • Parent commits fc685af
  • Branches default

Comments (0)

Files changed (2)

File configure

View file
 
 
 
+if test "$ENABLE_LIBRSVG" = "TRUE"
+then
 echo "$as_me:$LINENO: checking whether to build own version of librsvg" >&5
 echo $ECHO_N "checking whether to build own version of librsvg... $ECHO_C" >&6
 
    ;;
 esac
 
+else
+   SYSTEM_LIBGSF=YES
+
+   SYSTEM_LIBRSVG=YES
+
+   SYSTEM_GDKPIXBUF=YES
+
+   SYSTEM_GLIB=YES
+
+   SYSTEM_GETTEXT=YES
+
+   SYSTEM_LIBCROCO=YES
+
+   SYSTEM_PANGO=YES
+
+fi
 
 echo "$as_me:$LINENO: checking whether to build own version of libpng" >&5
 echo $ECHO_N "checking whether to build own version of libpng... $ECHO_C" >&6

File configure.in

View file
 AC_SUBST(USE_XINERAMA)
 AC_SUBST(XINERAMA_LINK)
 
+if test "$ENABLE_LIBRSVG" = "TRUE"
+then
 dnl ===================================================================
 dnl Test whether to build librsvg or rely on the system version
 dnl ===================================================================
    ;;
 esac
 AC_SUBST(SYSTEM_LIBGSF)
+else
+   SYSTEM_LIBGSF=YES
+   AC_SUBST(SYSTEM_LIBGSF)
+   SYSTEM_LIBRSVG=YES
+   AC_SUBST(SYSTEM_LIBRSVG)
+   SYSTEM_GDKPIXBUF=YES
+   AC_SUBST(SYSTEM_GDKPIXBUF)
+   SYSTEM_GLIB=YES
+   AC_SUBST(SYSTEM_GLIB)
+   SYSTEM_GETTEXT=YES
+   AC_SUBST(SYSTEM_GETTEXT)
+   SYSTEM_LIBCROCO=YES
+   AC_SUBST(SYSTEM_LIBCROCO)
+   SYSTEM_PANGO=YES
+   AC_SUBST(SYSTEM_PANGO)
+fi
 
 dnl ===================================================================
 dnl Test whether to build libpng or rely on the system version