X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=configure.ac;h=b540819fe14d54ca08d62a8829e053f333d6d3d8;hp=aae5e08fb285c4f1a392b3ae4bfeff7977a4b235;hb=2e05b1dd0490ce7ecdd15f522e6c700bc6522062;hpb=08bc314efca8bbde9e9461c4d425caf1e0ad0e5f

diff --git a/configure.ac b/configure.ac
index aae5e08..b540819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.18.1)
 LT_INIT
 
+AM_SILENT_RULES([yes])
+
 AX_WITH_CURSES
 AX_WITH_CURSES_MENU
 AX_WITH_CURSES_FORM
@@ -51,7 +53,7 @@ if test "x$ax_cv_curses" = xyes; then
 fi
 
 AC_CHECK_LIB([udev], [udev_new],
-	[],
+	[UDEV_LIBS=-ludev],
 	[AC_MSG_FAILURE([The libudev development library is required by petitboot.  Try installing the package libudev-dev or libudev-devel.])]
 )
 
@@ -247,11 +249,17 @@ AC_ARG_ENABLE(
 
 AS_IF(
 	[test "x$enable_debug" = "xyes"],
-	[AC_SUBST([DEFAULT_CFLAGS], ["$default_cflags -O0 -DDEBUG"])],
-	[AC_SUBST([DEFAULT_CFLAGS], ["$default_cflags -O2 -DNDEBUG"])]
+	[
+		AC_SUBST([DEFAULT_CFLAGS], ["$default_cflags -O0"])
+		AC_SUBST([DEFAULT_CPPFLAGS], ["-DDEBUG"])
+	],
+	[
+		AC_SUBST([DEFAULT_CFLAGS], ["$default_cflags -O2"])
+		AC_SUBST([DEFAULT_CPPFLAGS], ["-DNDEBUG"])
+	]
 )
  
-
+AC_SUBST([UDEV_LIBS])
 AC_SUBST([LIBTOOL_DEPS])
 AC_SUBST([DESTDIR])
 AC_SUBST([pkgsysconfdir], ["${sysconfdir}/${package}"])
@@ -259,20 +267,6 @@ AC_SUBST([pkgsysconfdir], ["${sysconfdir}/${package}"])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([
 	Makefile
-	discover/Makefile
-	discover/grub2/Makefile
-	lib/Makefile
-	man/Makefile
-	test/Makefile
-	test/lib/Makefile
-	test/parser/Makefile
-	test/urls/Makefile
-	ui/Makefile
-	ui/common/Makefile
-	ui/ncurses/Makefile
-	ui/test/Makefile
-	ui/twin/Makefile
-	utils/Makefile
 	po/Makefile.in
 ])