X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=4653db98c90f8c201e15ce240c2fed30adbb50a0;hb=858d08e4a3794e93d7c6178099c78812f130161e;hp=8b976fe7e3a81c15bbce4c5b6ed2fb07649f1eae;hpb=bdca80a8cd31e0b00d8942ca0000f1fa46311a28;p=evince.git

diff --git a/configure.ac b/configure.ac
index 8b976fe7..4653db98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,8 +106,8 @@ if test "$with_platform" = "win32"; then
   AC_MSG_RESULT([$os_win32])
 fi
 
-AM_CONDITIONAL([PLATFORM_WIN32],[test "with_platform" = "win32"])
-AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
+AM_CONDITIONAL([PLATFORM_HILDON],[test "$with_platform" = "hildon"])
+AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"])
 
 dnl Specify required versions of dependencies
 DBUS_GLIB_REQUIRED=0.70
@@ -134,16 +134,53 @@ PKG_CHECK_MODULES(LIBVIEW, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLI
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
 PKG_CHECK_MODULES(PREVIEWER, gtk+-2.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
-PKG_CHECK_MODULES(SHELL_CORE, libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gthread-2.0)
 
-if test "$os_win32" = no; then
-	PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0 sm >= 1.0.0)
-else
-	PKG_CHECK_MODULES(SMCLIENT, gtk+-2.0 gthread-2.0)
+SHELL_PLATFORM_PKGS=
+case "$with_platform" in
+  hildon) AC_DEFINE([PLATFORM_HILDON],[1],[Define if building for the hildon platform])
+          SHELL_PLATFORM_PKGS="hildon-1 hildon-fm-2 libosso"
+          ;;
+  *) SHELL_PLATFORM_PKGS="gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED"
+     ;;
+esac
+
+PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+
+# *********
+# SM client
+# *********
+
+GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
+
+SMCLIENT_PKGS=
+AC_MSG_CHECKING([which smclient backend to use])
+AC_ARG_WITH([smclient],
+  [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (no|xsmp|win32|quartz)])],
+  [],
+  [case "$GDK_TARGET" in
+    x11) case "$with_platform" in
+           gnome) with_smclient=xsmp SMCLIENT_PKGS="sm >= 1.0.0" ;;
+           *) with_smclient=no ;;
+         esac ;;
+    win32|quartz) with_smclient=$GDK_TARGET ;;
+    *) with_smclient=no ;;
+   esac])
+AC_MSG_RESULT([$with_smclient])
+
+if test "$with_smclient" != "no"; then
+  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+
+  PKG_CHECK_MODULES([SMCLIENT],[gtk+-2.0 gthread-2.0 $SMCLIENT_PKGS])
+  AC_SUBST([SMCLIENT_CFLAGS])
+  AC_SUBST([SMCLIENT_LIBS])
 fi
 
-AC_SUBST(SMCLIENT_CFLAGS)
-AC_SUBST(SMCLIENT_LIBS)
+AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
+AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
+AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
+AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
+
+# ***
 
 BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols"
 AC_SUBST(BACKEND_LIBTOOL_FLAGS)
@@ -194,34 +231,34 @@ fi
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`  
 AC_SUBST(GLIB_GENMARSHAL)
 
-dnl ========= Check for DBUS
-AC_ARG_ENABLE(dbus,
- 	[AC_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
-	enable_dbus="$enableval",enable_dbus=yes)
-if test "x$enable_dbus" != "xno"; then
-   	PKG_CHECK_MODULES([DBUS], [dbus-glib-1 >= $DBUS_GLIB_REQUIRED],
-	[enable_dbus=yes],[enable_dbus=no])
+# ****
+# DBUS
+# ****
 
-	if test "x$enable_dbus" = "xno"; then
-	   AC_MSG_WARN([DBUS support is disabled since dbus $DBUS_GLIB_REQUIRED or higher was not found])
-	fi	   
+AC_ARG_ENABLE([dbus],
+  [AS_HELP_STRING([--enable-dbus], [Compile with support for dbus])],
+  [],
+  [case "$with_platform" in
+      gnome) enable_dbus=yes ;;
+      hildon) enable_dbus=no ;;
+    esac])
 
-	if test "x$enable_dbus" = "xyes" ; then
-           	AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+if test "$enable_dbus" = "yes"; then
+  PKG_CHECK_MODULES([DBUS],[dbus-glib-1 >= $DBUS_GLIB_REQUIRED],[],
+                    [AC_MSG_ERROR([DBUS not found; use --disable-dbus to disable DBUS support])])
 
-        	if test x$DBUS_BINDING_TOOL = "xno" ; then
-        	   	AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
-        	fi                                            
+  AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool], [no])
+  if test x$DBUS_BINDING_TOOL = "xno" ; then
+          AC_MSG_ERROR([dbus-binding-tool executable not found in your path - should be installed with dbus glib bindings])
+  fi
 
-        	AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
-	fi
+  AC_DEFINE([ENABLE_DBUS],[1],[Define if DBUS support is enabled])
 fi
 
 AC_SUBST([DBUS_CFLAGS])
 AC_SUBST([DBUS_LIBS])
 
-AM_CONDITIONAL([ENABLE_DBUS], [test "x$enable_dbus" = "xyes"])
-AM_CONDITIONAL([DBUS_TOOL_NO_PREFIX], [test "x$DBUS_VERSION" = "x33"])
+AM_CONDITIONAL([ENABLE_DBUS], [test "$enable_dbus" = "yes"])
 
 dnl ========= Check for GConf
 
@@ -287,7 +324,7 @@ AC_SUBST(FRONTEND_LIBS)
 
 # Check for Nautilus property page build
 AC_ARG_ENABLE([nautilus],
-  [AS_HELP_STRING([--enable-nautilus],[compile the nautilus plugin])],
+  [AS_HELP_STRING([--disable-nautilus],[Build the nautilus extensions])],
   [],
   [case "$with_platform" in
      gnome) enable_nautilus=yes ;;
@@ -295,7 +332,8 @@ AC_ARG_ENABLE([nautilus],
     esac])
 
 if test "$enable_nautilus" = "yes" ; then
-  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension])
+  PKG_CHECK_MODULES([NAUTILUS],[gtk+-x11-2.0 $MM gthread-2.0 libnautilus-extension],
+                    [],[AC_MSG_ERROR([libnautilus-extension not found; use --disable-nautilus to disable the nautilus extensions])])
   NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
   AC_SUBST([nautilusextensiondir],[$NAUTILUS_EXTENSION_DIR])
   AC_SUBST(NAUTILUS_CFLAGS)
@@ -689,10 +727,12 @@ AC_OUTPUT
 
 echo "
 Configure summary:
+        Platform...........:  $with_platform
         GConf Support......:  $with_gconf
 	GTK+ Unix Print....:  $with_gtk_unix_print
 	Keyring Support....:  $with_keyring
 	DBUS Support.......:  $enable_dbus
+	SM client support..:  $with_smclient
 	Nautilus Plugin....:  $enable_nautilus
 	Thumbnailer........:  $enable_thumbnailer
 	Previewer..........:  $enable_previewer