+SeAuditingFileEventsWithContext()

[captive.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fb9b187..e189390 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -166,45 +166,8 @@ AH_BOTTOM([
  * would discard the effect of _FILE_OFFSET_BITS by AC_SYS_LARGEFILE.
  */
 
-#ifdef ENABLE_NLS
-/* <libintl.h> is taken from "$(top_srcdir)/intl" if system doesn't provide intl */
-#      include <libintl.h>
-#ifdef LIBCAPTIVE
-#      define _(String) dgettext (PACKAGE,String)
-#else
-#      define _(String) gettext (String)
-#endif /* LIBCAPTIVE */
-#      ifdef gettext_noop
-#              define N_(String) gettext_noop (String)
-#      else
-#              define N_(String) (String)
-#      endif
-#else /* !ENABLE_NLS */
-/* Stubs that do something close enough.  */
-#      define textdomain(String) (String)
-#      define gettext(String) (String)
-#      define dgettext(Domain,Message) (Message)
-#      define dcgettext(Domain,Message,Type) (Message)
-#      define bindtextdomain(Domain,Directory) (Domain)
-#      define _(String) (String)
-#      define N_(String) (String)
-#endif /* !ENABLE_NLS */
-
-#include <glib/gtypes.h>       /* for 'gchar' */
-#define G_LOG_DOMAIN ((const gchar *)"Captive")
-
-/* Ensure we have proper -I options: */
-#if defined(CAPTIVE_USE_GNOME_VFS_MODULE) || defined(CAPTIVE_USE_GNOME_VFS)
-#ifndef HAVE_GNOME_VFS_READ_ENTIRE_FILE
-#include <libgnomevfs/gnome-vfs-result.h>
-GnomeVFSResult gnome_vfs_read_entire_file(const char *uri,int *file_size,char **file_contents);
-#endif
-#endif
-
 /* Supplemental definitions not possible in this file. */
-#ifdef LIBCAPTIVE
 #include "captive/config2.h"
-#endif
 
 #endif /* !_CAPTIVE_CONFIG_H */
 ])
@@ -454,6 +417,9 @@ GLADE_W_INIT([
                        fi
                        ],[ AC_MSG_WARN([Captive requires libntfs (of ntfsprogs-devel) for --enable-install-pkg.]) ])
                ])
+if $have_gnome;then
+       GNOMEUI_CFLAGS="$GNOMEUI_CFLAGS -DCAPTIVE_USING_GNOMEUI"
+fi
 AC_SUBST(GNOMEUI_CFLAGS)
 AC_SUBST(GNOMEUI_LIBS)
 AC_SUBST(LIBNTFS_LIBS)