X-Git-Url: http://git.jankratochvil.net/?p=udpgate.git;a=blobdiff_plain;f=configure.ac;h=9d3c40b02144c4570e4dd44ba1307ce94d4eec14;hp=dd7caf81448c2f9f9abecfd6bedd22f1f92c06b3;hb=94f282965ea2f160cd58627e9c6123a3acd46798;hpb=749ea7c7bda6f692fa7b19fd294a1ea01de152c8

diff --git a/configure.ac b/configure.ac
index dd7caf8..9d3c40b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,9 +60,6 @@ AC_ARG_ENABLE(man-pages,
 		[  --enable-man-pages=no/yes/auto   pod2man(1) required for man pages (def.=yes)],,enable_man_pages=yes)
 
 
-dnl Permit 'if NEVER' for Makefile.am-s; symbol 'FALSE' forbidden by automake
-AM_CONDITIONAL(NEVER,false)
-
 PERL=
 AC_PATH_PROGS(PERL,perl5 perl)
 AM_CONDITIONAL(HAVE_PERL,test -n "$PERL")
@@ -167,6 +164,8 @@ AH_BOTTOM([
  *
  * @Returns: Formatted output string located in g_alloca() memory.
  */
+#include <glib/galloca.h>
+#include <glib/gutils.h>
 #define udpgate_printf_alloca(format,args...) ({ \
 		gsize _udpgate_printf_alloca_size=udpgate_nv_printf_string_upper_bound((format) , ## args); \
 		gchar *_udpgate_printf_alloca_r=g_alloca(_udpgate_printf_alloca_size); \
@@ -201,14 +200,19 @@ AC_CHECK_LIB(popt,poptParseArgvString,[POPT_LIBS="-lpopt"],[AC_MSG_ERROR([UDPGat
 AC_SUBST(POPT_LIBS)
 
 GLADE_W_INIT([
-	./src/install/acquire/ui-gnome-interface.c
-	./src/install/acquire/ui-gnome-interface.h
-	./src/install/acquire/ui-gnome-callbacks.h
-	./src/install/acquire/ui-gnome-support.c
-	./src/install/acquire/ui-gnome-support.h
+	./src/ui-gnome-interface.c
+	./src/ui-gnome-interface.h
+	./src/ui-gnome-callbacks.h
+	./src/ui-gnome-support.c
+	./src/ui-gnome-support.h
 	])
 AC_SUBST(GNOMEUI_CFLAGS)
 AC_SUBST(GNOMEUI_LIBS)
+if $have_gnome
+then
+	AC_DEFINE(HAVE_GNOME,,[Compile Gnome support.])
+fi
+AM_CONDITIONAL(HAVE_GNOME,[ $have_gnome ])
 AM_CONDITIONAL(HAVE_GLADE_WRITESOURCE,[ test "x$PATH_GLADE" != "x" ])
 dnl Do not: AM_CONDITIONAL(BUILD_GLADESRC,[ test "xyes" = "x$BUILD_GLADESRC" ])
 dnl as we do not need it as we are conditioned by ENABLE_INSTALL_PKG