X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git;a=blobdiff_plain;f=configure.ac;h=f16ff7f6c0c43f68168f1a70367dd78079f0ae1f;hp=4656a119aa6d4a5ab2784142dfd736aa90f18c40;hb=5713a8e46559b6de9fbf5fc3e073d0d482d8c7e1;hpb=d3854f46024f79896c334a8ffae5f52de8c54962

diff --git a/configure.ac b/configure.ac
index 4656a11..f16ff7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
-
-AC_INIT([at-spi2-atk], [0.1.0], [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
@@ -24,7 +23,6 @@ AC_SUBST(LT_AGE)
 AM_INIT_AUTOMAKE([-Wall foreign])
 
 AC_PROG_CC
-AM_PATH_PYTHON(2.4)
 AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
@@ -35,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)
@@ -73,37 +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
-		 tests/Makefile
+		 droute/Makefile
 		 common/Makefile
 		 atk-adaptor/Makefile
-		 tests/dummyatk/Makefile
-		 tests/data/Makefile
-		 tests/pyatspi/Makefile
-		 tests/pyatspi/pasytest/Makefile
-		 tests/apps/Makefile
-		 tests/cspi/Makefile
-		 cspi/Makefile
-		 pyatspi/Makefile
+		 atk-adaptor/adaptors/Makefile
 		])
 
 AC_OUTPUT