X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=configure.ac;h=51f5549ceeec2d0f4677111f830690d1a80df571;hb=b9de5036b3ad61f268a686466abfc55915c786f4;hp=ac82242c14804dba6f1f2be6b1070ebd67dc6b49;hpb=b2f9cb29d7978ecd1c27b76670d8a99f4acd85ed;p=udpgate.git

diff --git a/configure.ac b/configure.ac
index ac82242..51f5549 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.4cvs)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 dnl Prevent "AC_TRY_COMPILE was called before AC_ISC_POSIX":
@@ -59,19 +59,31 @@ 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)
+		[  --enable-bundle                  Build single binary containing bundled init.d/fonts/...(def.=no)],,enable_bundle=no)
 
 
+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
 
-PERL=
-AC_PATH_PROGS(PERL,perl5 perl)
-AM_CONDITIONAL(HAVE_PERL,test -n "$PERL")
-
 POD2MAN=
 AC_PATH_PROGS(POD2MAN,pod2man)
 AM_CONDITIONAL(HAVE_POD2MAN,[ test -n "$POD2MAN" ])
@@ -244,6 +256,7 @@ udpgate.spec
 Makefile
 ./macros/Makefile
 ./init.d/Makefile
+./fonts/Makefile
 ./src/Makefile
 ])