X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.ac;h=cb4b34040ee89ffbfab4eb34016f0e4338362caa;hb=6bb01f7e93b4d665f5dc27bebea7b15bda645539;hp=66b8eef203c80792c43b16c5c96ceaa80c578f5b;hpb=ef2834fbc86886490c706e476bff995f34a01468;p=udpgate.git

diff --git a/configure.ac b/configure.ac
index 66b8eef..cb4b340 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl 2.53 for AM_GLIB_GNU_GETTEXT:
 AC_PREREQ(2.53)
 dnl Not yet present in: Red Hat autoconf-2.57-3
 dnl AC_CONFIG_MACRO_DIR(macros)
-AM_INIT_AUTOMAKE(udpgate,1.0cvs)
+AM_INIT_AUTOMAKE(udpgate,1.0.2cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Prevent "AC_TRY_COMPILE was called before AC_ISC_POSIX":
@@ -58,15 +58,32 @@ AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])
 
 AC_ARG_ENABLE(man-pages,
 		[  --enable-man-pages=no/yes/auto   pod2man(1) required for man pages (def.=yes)],,enable_man_pages=yes)
+AC_ARG_ENABLE(bundle,
+		[  --enable-bundle                  Build single binary containing locale and init.d files (def.=no)],,enable_bundle=no)
 
 
-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")
 
+AM_CONDITIONAL(ENABLE_BUNDLE,[ test "x$enable_bundle" = "xyes" ])
+if test "x$enable_bundle" = "xyes"
+then
+	AC_DEFINE(ENABLE_BUNDLE,,[Build single binary containing locale and init.d files.])
+	if test -f src/bundle.c
+	then
+		if test -z "$PERL"
+		then
+			AC_MSG_WARN([Perl not found (see above). The --enable-bundle files cannot be updated yourself.])
+		fi
+	else
+		if test -z "$PERL"
+		then
+			AC_MSG_ERROR([Perl not found (see above). --enable-bundle is not possible as src/bundle.c is missing.])
+		fi
+	fi
+fi
+
 POD2MAN=
 AC_PATH_PROGS(POD2MAN,pod2man)
 AM_CONDITIONAL(HAVE_POD2MAN,[ test -n "$POD2MAN" ])
@@ -203,14 +220,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
@@ -233,6 +255,7 @@ udpgate.spec
 ./macros/glade-w.sh
 Makefile
 ./macros/Makefile
+./init.d/Makefile
 ./src/Makefile
 ])