Integrate leasing scheme in-to atk-bridge.

[platform/core/uifw/at-spi2-atk.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7d588ce..f16ff7f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([at-spi2-atk], [0.1.2], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-atk], [0.1.4], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 
 AT_SPI_ATK_MAJOR_VERSION=0
@@ -33,14 +33,6 @@ PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.0])
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 
-PKG_CHECK_MODULES(DROUTE, [droute-0.1 >= 0.1])
-AC_SUBST(DROUTE_LIBS)
-AC_SUBST(DROUTE_CFLAGS)
-
-PKG_CHECK_MODULES(DBIND, [dbind-0.1 >= 0.1])
-AC_SUBST(DBIND_LIBS)
-AC_SUBST(DBIND_CFLAGS)
-
 PKG_CHECK_MODULES(GLIB, [glib-2.0])
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)
@@ -71,29 +63,58 @@ AC_SUBST(GTK_CFLAGS)
 
 AC_PATH_XTRA
 
+if test x$no_x = xyes ; then
+       AC_MSG_ERROR([X development libraries not found])
+else
+       X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+fi
+AC_SUBST(X_LIBS)
+
 AC_ARG_VAR([DEFAULT_ATSPI_INTROSPECTION_PATH],
           [Set the default path for the install ofDBus introspection XML
            relative to the pkgdatadir.])
 if test -z "$DEFAULT_ATSPI_INTROSPECTION_PATH"; then
-         DEFAULT_ATSPI_INTROSPECTION_PATH=dbus
+         DEFAULT_ATSPI_INTROSPECTION_PATH=at-spi2/dbus
 fi
 
-AC_ARG_VAR([GTK_MODULE_DIR],
-          [Where to place the atk-adaptor gtk module])
-if test -z "$GTK_MODULE_DIR"; then
-         GTK_MODULE_DIR=gtk-2.0/modules
+AC_ARG_ENABLE(relocate, [  --enable-relocate  Relocate to coexist with CORBA [default=no]], enable_relocate="$enableval", enable_relocate=no)
+if test x$enable_relocate = xyes ; then
+       AC_DEFINE(RELOCATE, , [Relocate to coexist with CORBA])
 fi
+AM_CONDITIONAL(RELOCATE, test x$enable_relocate = xyes)
 
 #libtool option to strip symbols starting with cspi
 LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^cspi]].*"'
 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
 
+# Extra libraries for sockets added by Willie Walker
+# based upon how SunStudio libraries work.
+#
+if test "$GCC" = yes; then
+    EXTRA_SOCKET_LIBS=""
+else
+    EXTRA_SOCKET_LIBS="-lsocket -lnsl"
+fi
+AC_SUBST(EXTRA_SOCKET_LIBS)
+
+dnl find sizes & alignments
+#orig_CPPFLAGS=$CPPFLAGS
+#CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+#DBIND_CHECK_ALIGNOF(char)
+#DBIND_CHECK_ALIGNOF(dbus_bool_t)
+#DBIND_CHECK_ALIGNOF(dbus_int16_t)
+#DBIND_CHECK_ALIGNOF(dbus_int32_t)
+#DBIND_CHECK_ALIGNOF(dbus_int64_t)
+#DBIND_CHECK_ALIGNOF(double)
+#DBIND_CHECK_ALIGNOF(dbind_pointer)
+#DBIND_CHECK_ALIGNOF(dbind_struct)
+#CPPFLAGS=$orig_CPPFLAGS 
+
 AC_CONFIG_FILES([Makefile
-                pkgconfig/cspi-1.0.pc
-                pkgconfig/cspi-1.0-uninstalled.pc
+                droute/Makefile
                 common/Makefile
                 atk-adaptor/Makefile
-                cspi/Makefile
+                atk-adaptor/adaptors/Makefile
                ])
 
 AC_OUTPUT