X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=configure.ac;h=0c54f5bf92224f3a06b15e11ee0b52fbc162e9a6;hp=5eadfb51f94408a5a79aed70391e0b3bcd83dfc2;hb=badb96ea524f426b4bd6814c2fca28477610546b;hpb=4e8cc699a9a33db131ab29ea55b1993558eda1e0

diff --git a/configure.ac b/configure.ac
index 5eadfb5..0c54f5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_CHECK_HEADERS([dbox/fp.h dbox/lcd-ks0713.h])
 
-AC_PATH_PROG(MSGFMT,[msgfmt])
-AC_PATH_PROG(MSGINIT,[msginit])
-AC_PATH_PROG(MSGMERGE,[msgmerge])
-AC_PATH_PROG(MSGUNIQ,[msguniq])
-AC_PATH_PROG(XGETTEXT,[xgettext])
-if test -z "$MSGFMT" -o -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then
-	AC_MSG_ERROR([Could not find required gettext tools])
-fi
+AC_PATH_PROG(MSGFMT, msgfmt, AC_MSG_ERROR(Could not find msgfmt))
 
 AM_PATH_PYTHON
 AX_PYTHON_DEVEL
@@ -88,10 +81,23 @@ fi
 AC_ARG_WITH(po,
 	AS_HELP_STRING([--with-po],[enable updating of po files]),
 	[with_po="$withval"],[with_po="no"])
+if test "$with_po" = "yes"; then
+	AC_PATH_PROG(MSGINIT, msginit)
+	AC_PATH_PROG(MSGMERGE, msgmerge)
+	AC_PATH_PROG(MSGUNIQ, msguniq)
+	AC_PATH_PROG(XGETTEXT, xgettext)
+	if test -z "$MSGINIT" -o -z "$MSGMERGE" -o -z "$MSGUNIQ" -o -z "$XGETTEXT"; then
+		AC_MSG_ERROR([Could not find required gettext tools])
+	fi
+fi
 AM_CONDITIONAL(UPDATE_PO, test "$with_po" = "yes")
 
+ENIGMA2_CFLAGS="-fno-rtti -fno-exceptions"
+AC_SUBST(ENIGMA2_CFLAGS)
+
 CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
-CXXFLAGS="$CXXFLAGS $BASE_CFLAGS $PTHREAD_CFLAGS $DEBUG_CFLAGS -fno-rtti -fno-exceptions -Wall"
+CFLAGS="$CFLAGS $DEBUG_CFLAGS -Wall"
+CXXFLAGS="$CXXFLAGS $DEBUG_CFLAGS -Wall $BASE_CFLAGS $ENIGMA2_CFLAGS $PTHREAD_CFLAGS"
 
 AC_CONFIG_FILES([
 Makefile