Omit GnomeVFS Captive config for the static build - there is no .so there.

[captive.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index fb9b187..9fa79c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,8 @@ AC_ARG_ENABLE(standalone,
                [  --enable-standalone=no/yes       provide initialization for static-build (def.=no)],,enable_standalone=no)
 AC_ARG_ENABLE(standalone-fonts,
                [  --enable-standalone-fonts=DIR    provide bundled Gnome fonts in directory (def.=no)],,enable_standalone_fonts=no)
+AC_ARG_ENABLE(standalone-yum,
+               [  --enable-standalone-yum=DIR      provide bundled yum(8) packaging configuration directory (def.=no)],,enable_standalone_yum=no)
 
 
 # AC_ARG_ENABLE(sbin-mountdir,[--enable-sbin-mountdir=DIR],,[enable_sbin_mountdir="/sbin"])
@@ -166,45 +168,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 +419,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)
@@ -486,6 +454,7 @@ AC_SUBST(GNOME_VFS_READ_ENTIRE_FILE_O)
 if test x$enable_standalone = xyes;then
        AC_DEFINE(ENABLE_STANDALONE,,[Provide initialization for static-build])
 fi
+AM_CONDITIONAL(ENABLE_STANDALONE,[test x$enable_standalone = xyes])
 
 fontsdir=
 if test x$enable_standalone_fonts != xno;then
@@ -501,6 +470,13 @@ if test x$have_gnome != xtrue -a x$have_gnome != xfalse;then
 fi
 AM_CONDITIONAL(HAVE_GNOME,[test "$have_gnome" = "true"])
 
+yum_repos_ddir=
+if test x$enable_standalone_yum != xno;then
+       yum_repos_ddir="$enable_standalone_yum"
+fi
+AC_SUBST(yum_repos_ddir)
+AM_CONDITIONAL(ENABLE_STANDALONE_YUM_REPOS_D,[test "$enable_standalone_yum" != "no"])
+
 AC_SUBST(CFLAGS)
 AC_SUBST(LIBS)
 
@@ -554,6 +530,7 @@ Makefile
 ./src/libcaptive/reactos/ntoskrnl/rtl/i386/Makefile
 ./src/libcaptive/reactos/ntoskrnl/se/Makefile
 ./src/libcaptive/halcaptive/Makefile
+./src/libcaptive/captivemodid/Makefile
 ./src/libcaptive/cc/Makefile
 ./src/libcaptive/cm/Makefile
 ./src/libcaptive/ex/Makefile
@@ -589,6 +566,7 @@ Makefile
 ./doc/apiref/Makefile
 ./fonts/Makefile
 ./fonts/fonts.conf
+./yum.repos.d/Makefile
 ])
 
 dnl FIXME: Why is "po/POTFILES" being substituted?