configure.ac (ce07229a) configure.ac (e4fb754e)
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 2485 unchanged lines hidden (view full) ---

2494 esac
2495 elif test "$_os" = "SunOS"; then
2496 DEFAULT_TO_STLPORT="yes"
2497 elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
2498 DEFAULT_TO_STLPORT="yes"
2499 elif test "$_os" = "OS2"; then
2500 DEFAULT_TO_STLPORT="yes"
2501 elif test "$_os" = "FreeBSD"; then
1dnl /******************************************************************
2dnl * vi:set sw=3 ts=3 et:
3dnl *
4dnl * Name: configure.in
5dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland
6dnl * Date: $Date: 2008-09-08 07:38:40 $
7dnl *
8dnl * Desc: This file serves as input for the GNU autoconf package

--- 2485 unchanged lines hidden (view full) ---

2494 esac
2495 elif test "$_os" = "SunOS"; then
2496 DEFAULT_TO_STLPORT="yes"
2497 elif test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
2498 DEFAULT_TO_STLPORT="yes"
2499 elif test "$_os" = "OS2"; then
2500 DEFAULT_TO_STLPORT="yes"
2501 elif test "$_os" = "FreeBSD"; then
2502 DEFAULT_TO_STLPORT="yes"
2502 DEFAULT_TO_STLPORT="no"
2503 fi
2504 if test "$DEFAULT_TO_STLPORT" = "yes"; then
2505 AC_MSG_RESULT([stlport])
2506 else
2507 AC_MSG_RESULT([system])
2508 fi
2509 if test "$WITH_STLPORT" = "auto"; then
2510 WITH_STLPORT=$DEFAULT_TO_STLPORT

--- 4463 unchanged lines hidden (view full) ---

6974dnl Test whether to build libjpeg or rely on the system version
6975dnl ===================================================================
6976dnl FIXME: this is currently because we have jpeg-6b for our filters
6977dnl and jpeg-8 as dependency for librsvg
6978dnl this should be unified into using only one version for both
6979
6980AC_MSG_CHECKING([whether to build own version of libjpeg])
6981
2503 fi
2504 if test "$DEFAULT_TO_STLPORT" = "yes"; then
2505 AC_MSG_RESULT([stlport])
2506 else
2507 AC_MSG_RESULT([system])
2508 fi
2509 if test "$WITH_STLPORT" = "auto"; then
2510 WITH_STLPORT=$DEFAULT_TO_STLPORT

--- 4463 unchanged lines hidden (view full) ---

6974dnl Test whether to build libjpeg or rely on the system version
6975dnl ===================================================================
6976dnl FIXME: this is currently because we have jpeg-6b for our filters
6977dnl and jpeg-8 as dependency for librsvg
6978dnl this should be unified into using only one version for both
6979
6980AC_MSG_CHECKING([whether to build own version of libjpeg])
6981
6982if test "$SYSTEM_JPEG" == "YES"; then
6982if test "$SYSTEM_JPEG" = "YES"; then
6983SYSTEM_LIBJPEG=YES
6984else
6985case "$_os" in
6986 WINNT*) # Windows
6987 SYSTEM_LIBJPEG=NO
6988 AC_MSG_RESULT([yes])
6989 ;;
6990 Darwin*)
6991 SYSTEM_LIBJPEG=NO
6992 AC_MSG_RESULT([yes])
6993 ;;
6994 *)
6995 SYSTEM_LIBJPEG=YES
6996 AC_MSG_RESULT([no])
6997 ;;
6998esac
6999fi
7000
6983SYSTEM_LIBJPEG=YES
6984else
6985case "$_os" in
6986 WINNT*) # Windows
6987 SYSTEM_LIBJPEG=NO
6988 AC_MSG_RESULT([yes])
6989 ;;
6990 Darwin*)
6991 SYSTEM_LIBJPEG=NO
6992 AC_MSG_RESULT([yes])
6993 ;;
6994 *)
6995 SYSTEM_LIBJPEG=YES
6996 AC_MSG_RESULT([no])
6997 ;;
6998esac
6999fi
7000
7001if test "$SYSTEM_LIBJPEG" == "YES"; then
7001if test "$SYSTEM_LIBJPEG" = "YES"; then
7002 AC_MSG_RESULT([no])
7003else
7004 AC_MSG_RESULT([yes])
7005fi
7006AC_SUBST(SYSTEM_LIBJPEG)
7007
7008
7009dnl ===================================================================

--- 184 unchanged lines hidden (view full) ---

7194 AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
7195 fi
7196fi
7197rm -f conftest* core core.* *.core
7198
7199OOO_JUNIT_JAR=
7200if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
7201 AC_MSG_CHECKING([for JUnit 4])
7002 AC_MSG_RESULT([no])
7003else
7004 AC_MSG_RESULT([yes])
7005fi
7006AC_SUBST(SYSTEM_LIBJPEG)
7007
7008
7009dnl ===================================================================

--- 184 unchanged lines hidden (view full) ---

7194 AC_MSG_ERROR([no. Did you install ant-apache-regexp?])
7195 fi
7196fi
7197rm -f conftest* core core.* *.core
7198
7199OOO_JUNIT_JAR=
7200if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
7201 AC_MSG_CHECKING([for JUnit 4])
7202 if test "$with_junit" == "yes"; then
7202 if test "$with_junit" = "yes"; then
7203 if test -e /usr/share/java/junit4.jar; then
7204 OOO_JUNIT_JAR=/usr/share/java/junit4.jar
7205 else
7206 if test -e /usr/share/lib/java/junit.jar; then
7207 OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
7208 else
7209 OOO_JUNIT_JAR=/usr/share/java/junit.jar
7210 fi

--- 210 unchanged lines hidden --- 		7203 if test -e /usr/share/java/junit4.jar; then
7204 OOO_JUNIT_JAR=/usr/share/java/junit4.jar
7205 else
7206 if test -e /usr/share/lib/java/junit.jar; then
7207 OOO_JUNIT_JAR=/usr/share/lib/java/junit.jar
7208 else
7209 OOO_JUNIT_JAR=/usr/share/java/junit.jar
7210 fi

--- 210 unchanged lines hidden ---