[Hugin-cvs] hugin configure.ac,1.30,1.31

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv21725

Modified Files:
	configure.ac 
Log Message:
added --disable-gui configure option, for people that just want to build
fulla and nona. This does not require wxWidgets.


Index: configure.ac
===================================================================
RCS file: /cvsroot/hugin/hugin/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- configure.ac	19 Apr 2006 20:30:59 -0000	1.30
+++ configure.ac	8 Jun 2006 20:15:40 -0000	1.31
@@ -61,6 +61,22 @@
 
 AM_CONDITIONAL(HAVE_AMD64, test "${HCPU}" = "amd64")
 
+AC_ARG_ENABLE(gui,
+          AC_HELP_STRING([--disable-gui],
+		         [disable gui (compile only nona and fulla)]))
+
+
+dnl Whether GCJ_PROPERTIES is used depends on the target.
+if test -n "$enable_gio"; then
+	with_gui='yes'
+fi
+if test "$enable_gui" = no; then
+	with_gui='no'
+fi
+
+AM_CONDITIONAL(BuildGUI, test "x$with_gui" = 'xyes')
+
+
 dnl --- look for "ZIP", required for building the help file
 AC_PATH_PROG(ZIP, zip, no)
 if [[ $ZIP = "no" ]] ; then
@@ -209,6 +225,8 @@
 dnl     ])
 dnl fi
 
+if test "x$with_gui" = 'xyes' ; then
+
 if test "x$with_unicode" = 'xyes' ; then
   AM_PATH_WXCONFIG(2.4.2, wxWin=1,,, --unicode=yes)
 else
@@ -238,6 +256,8 @@
   fi
 fi
 
+fi
+
 AC_DEFINE_UNQUOTED(HUGIN_VERSION, $PACKAGE_VERSION)
 
 case "$HSYS" in
@@ -323,6 +343,7 @@
 echo "BOOST            --with-boost=$with_boost		have_boost = $have_boost"
 echo "Unicode          --with-unicode=$with_unicode"
 echo "Debug enabled?   $enable_debug"
+echo "compile GUI programs hugin and nona_gui:    $with_gui"
 echo ""
 echo "Options used to compile and link:"
 echo "  PREFIX           = $prefix"