Anonymous avatar Anonymous committed b8c6033

rsgvlibs: adapt build configuration

Comments (0)

Files changed (3)

 AC_SUBST(XINERAMA_LINK)
 
 dnl ===================================================================
+dnl Test whether to build librsvg or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of librsvg])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_LIBRSVG=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_LIBRSVG=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_LIBRSVG=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_LIBRSVG)
+
+dnl ===================================================================
+dnl Test whether to build gdk-pixbuf or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of gdk-pixbuf])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_GDKPIXBUF=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_GDKPIXBUF=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_GDKPIXBUF=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_GDKPIXBUF)
+
+dnl ===================================================================
+dnl Test whether to build glib or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of glib])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_GLIB=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_GLIB=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_GLIB=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_GLIB)
+
+dnl ===================================================================
+dnl Test whether to build gettext or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of gettext])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_GETTEXT=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_GETTEXT=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_GETTEXT=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_GETTEXT)
+
+dnl ===================================================================
+dnl Test whether to build libcroco or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of libcroco])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_LIBCROCO=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_LIBCROCO=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_LIBCROCO=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_LIBCROCO)
+
+dnl ===================================================================
+dnl Test whether to build pango or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of pango])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_PANGO=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_PANGO=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_PANGO=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_PANGO)
+
+dnl ===================================================================
+dnl Test whether to build libpng or rely on the system version
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build own version of libpng])
+
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_LIBPNG=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_LIBPNG=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_LIBPNG=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+AC_SUBST(SYSTEM_LIBPNG)
+
+dnl ===================================================================
+dnl Test whether to build libjpeg or rely on the system version
+dnl ===================================================================
+dnl FIXME: this is currently because we have jpeg-6b for our filters
+dnl        and jpeg-8 as dependency for librsvg
+dnl        this should be unified into using only one version for both
+
+AC_MSG_CHECKING([whether to build own version of libjpeg])
+
+if test "$SYSTEM_JPEG" == "YES"; then
+SYSTEM_LIBJPEG=YES
+else
+case "$_os" in
+	WINNT*) # Windows
+	    SYSTEM_LIBJPEG=NO
+	    AC_MSG_RESULT([yes])
+		;;
+	Darwin*)
+	    SYSTEM_LIBJPEG=NO
+	    AC_MSG_RESULT([yes])
+	    ;;
+   *)
+   SYSTEM_LIBJPEG=YES
+   AC_MSG_RESULT([no])
+   ;;
+esac
+fi
+
+if test "$SYSTEM_LIBJPEG" == "YES"; then
+   AC_MSG_RESULT([no])
+else
+   AC_MSG_RESULT([yes])
+fi
+AC_SUBST(SYSTEM_LIBJPEG)
+
+
+dnl ===================================================================
 dnl Test for the presence of Ant and that it works
 dnl ===================================================================
 
 ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
 ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
 ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
+ToFile( "SYSTEM_LIBRSVG",    "@SYSTEM_LIBRSVG@",   "e" );
+ToFile( "SYSTEM_GDKPIXBUF",  "@SYSTEM_GDKPIXBUF@",   "e" );
+ToFile( "SYSTEM_GLIB",       "@SYSTEM_GLIB@",   "e" );
+ToFile( "SYSTEM_GETTEXT",    "@SYSTEM_GETTEXT@",   "e" );
+ToFile( "SYSTEM_LIBCROCO",   "@SYSTEM_LIBCROCO@",   "e" );
+ToFile( "SYSTEM_PANGO",      "@SYSTEM_PANGO@",   "e" );
+ToFile( "SYSTEM_LIBPNG",     "@SYSTEM_LIBPNG@",   "e" );
+ToFile( "SYSTEM_LIBJPEG",    "@SYSTEM_LIBJPEG@",   "e" );
 ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
 ToFile( "NEON_LIBS",         "@NEON_LIBS@",        "e" );
 ToFile( "NEON_CFLAGS",       "@NEON_CFLAGS@",      "e" );

solenv/config/sdev300.ini

             SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
             SOLAR_JAVA TRUE
             ZIPDEP perl %SOLARENV%/bin/zipdep.pl
-            ENABLE_GCONF TRUE
-            ENABLE_GNOMEVFS TRUE
+            ENABLE_GCONF YES
+            ENABLE_GNOMEVFS YES
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             ENABLE_GNOMEVFS TRUE
             GNUCOPY cp
             GNUMAKE make
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             ENABLE_GCONF TRUE
             ENABLE_GNOMEVFS TRUE
             GNUMAKE make
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             BUILD_PIXMAN YES
             WITH_MOZILLA YES
             ENABLE_CAIRO TRUE
+            SYSTEM_LIBRSVG NO
+            SYSTEM_LIBCROCO NO
+            SYSTEM_GDKPIXBUF NO
+            SYSTEM_GLIB NO
+            SYSTEM_GETTEXT NO
+            SYSTEM_PANGO NO
+            SYSTEM_LIBPNG NO
+            SYSTEM_LIBJPEG NO
         }
         common2
         {
             ENABLE_GNOMEVFS TRUE
             GNUCOPY gnucp
             GNUMAKE gmake
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             ENABLE_GNOMEVFS TRUE
             GNUCOPY gnucp
             GNUMAKE gmake
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             ENABLE_GCONF TRUE
 #           ENABLE_GNOMEVFS TRUE
             GNUMAKE gmake
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             XCLASSPATH .
             ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
             GNUMAKE make
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             WINDOWS_VISTA_PSDK TRUE
             XCLASSPATH .
             ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+            SYSTEM_LIBRSVG YES
+            SYSTEM_LIBCROCO YES
+            SYSTEM_GDKPIXBUF YES
+            SYSTEM_GLIB YES
+            SYSTEM_GETTEXT YES
+            SYSTEM_PANGO YES
+            SYSTEM_LIBPNG YES
+            SYSTEM_LIBJPEG YES
         }
         common0
         {
             CHECK_LUCENCE_INDEXER_OUTPUT TRUE
             GNUCOPY cp
             GNUMAKE make
+            SYSTEM_LIBRSVG NO
+            SYSTEM_LIBCROCO NO
+            SYSTEM_GDKPIXBUF NO
+            SYSTEM_GLIB NO
+            SYSTEM_GETTEXT NO
+            SYSTEM_PANGO NO
+            SYSTEM_LIBPNG NO
+            SYSTEM_LIBJPEG NO
         }
         common0
         {
             BUILD_X64 TRUE
             GNUCOPY cp
             GNUMAKE make
+            SYSTEM_LIBRSVG NO
+            SYSTEM_LIBCROCO NO
+            SYSTEM_GDKPIXBUF NO
+            SYSTEM_GLIB NO
+            SYSTEM_GETTEXT NO
+            SYSTEM_PANGO NO
+            SYSTEM_LIBPNG NO
+            SYSTEM_LIBJPEG NO
         }
         common0
         {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.