Merge pull request #32 from qarkai/pre-gtk3

Prepare to migrate to GTK3

Makefile.am

@@ -27,6 +27,22 @@ pixmaps= \
 pixmapdir=$(pkgdatadir)/pixmaps
 pixmap_DATA=$(pixmaps)
 
+ui= \
+  ui/about_dialog.ui \
+  ui/error_dialog.ui \
+  ui/fileselection1.ui \
+  ui/fileselection2.ui \
+  ui/fileselection3.ui \
+  ui/fragmentation_dialog.ui \
+  ui/interface_dialog.ui \
+  ui/sel1_dialog.ui \
+  ui/tos_dialog.ui \
+  ui/udp_payload_dialog.ui \
+  ui/window1.ui
+
+uidir=$(pkgdatadir)/ui
+ui_DATA=$(ui)
+
 DEFS= \
   -DPKGDATADIR=\"$(pkgdatadir)/\"
 
@@ -39,7 +55,8 @@ AM_CPPFLAGS = \
   -Wmissing-prototypes \
   -Wmissing-declarations \
   -Wunused \
+  -Wl,--export-dynamic \
   $(DEPS_CFLAGS)
 
 # Include the dev and pixmaps in the distribution (make dist)
-EXTRA_DIST=dev src/pixmaps
+EXTRA_DIST=dev src/pixmaps $(ui)

configure.ac

@@ -20,7 +20,7 @@ AC_CHECK_LIB([pthread], [pthread_create])
 AC_CHECK_HEADERS([libintl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h sys/timeb.h unistd.h])
 
 # We need GTK
-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 gthread-2.0 >= 2.4"
+pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 gthread-2.0 >= 2.4 gmodule-export-2.0 >= 2.4"
 PKG_CHECK_MODULES(DEPS, [$pkg_modules])
 
 # Checks for library functions.