'./configure' requirements made optional for various parts of projects.

Sandbox/LUFS '--with' options renamed to the more appropriate '--enable' ones.

diff --git a/captive.spec.in b/captive.spec.in
index 92b7f09..b31918e 100644 (file)
--- a/captive.spec.in
+++ b/captive.spec.in
@@ -116,11 +116,14 @@ CFLAGS="-O2"
 %configure \
                --enable-shared --disable-static \
                --with-readline \
-               --with-sandbox-setuid=@PACKAGE@ \
-               --with-sandbox-setgid=@PACKAGE@ \
-               --with-sandbox-chroot=%{_var}/lib/@PACKAGE@ \
-               --with-sbin-mountdir=/sbin \
-               --with-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
+               --disable-bug-replay \
+               --enable-lufs \
+               --enable-install-pkg \
+               --enable-sandbox-setuid=@PACKAGE@ \
+               --enable-sandbox-setgid=@PACKAGE@ \
+               --enable-sandbox-chroot=%{_var}/lib/@PACKAGE@ \
+               --enable-sbin-mountdir=/sbin \
+               --enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
                --disable-gtk-doc
 make
 

diff --git a/configure.in b/configure.in
index cd9d5c2..c06a44f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -50,8 +50,8 @@ AM_GLIB_GNU_GETTEXT
 
 GTK_DOC_CHECK
 dnl AM_CONDITIONAL needs to be here explicitely for doc/apiref/Makefile rebuild
-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+AM_CONDITIONAL(ENABLE_GTK_DOC,[test x$enable_gtk_doc = xyes])
+AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL,[test -n "$LIBTOOL"])
 
 dnl Do not discard 'CFLAGS' settings as they may have been passed us by rpmbuild(8)
 
@@ -64,39 +64,60 @@ dnl Some Makefiles use additional tests etc.
 AM_CONDITIONAL(MAINTAINER_MODE,[test "$USE_MAINTAINER_MODE" = "yes"])
 
 
-AC_ARG_WITH(sbin-mountdir,
-               [  --with-sbin-mountdir=dir      mount(8) 'mount.captive' directory (def.=/sbin)],,
-               [ with_sbin_mountdir="/sbin" ])
-AM_CONDITIONAL(WITH_SBIN_MOUNT,[test "$with_sbin_mount" != "no"])
-AC_SUBST(with_sbin_mountdir)
-
-AC_ARG_WITH(sbin-mount-fs,
-               [  --with-sbin-mount-fs=fs1:fs2  sbin-mount pre-installed symlinks (def.=ntfs:fastfat:cdfs:ext2fsd)],,
-               [ with_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd" ])
-AC_SUBST(with_sbin_mount_fs)
-
-AC_ARG_WITH(sandbox-setuid,
-               [  --with-sandbox-setuid=user    non-privileged user  for captive-sandbox-server (def.=captive)],
-               [ CAPTIVE_SANDBOX_SETUID="$withval" ],[ CAPTIVE_SANDBOX_SETUID="captive" ])
+AC_ARG_ENABLE(sbin-mountdir,
+               [  --enable-sbin-mountdir=DIR       mount(8) 'mount.captive' directory (def.=/sbin)],,
+               [ enable_sbin_mountdir="/sbin" ])
+AC_ARG_ENABLE(sbin-mount-fs,
+               [  --enable-sbin-mount-fs=FS1:FS2   sbin-mount pre-installed symlinks (def.=ntfs:fastfat:cdfs:ext2fsd)],,
+               [ enable_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd" ])
+AC_ARG_ENABLE(sandbox-setuid,
+               [  --enable-sandbox-setuid=USER     non-privileged user  for captive-sandbox-server (def.=captive)],
+               [ CAPTIVE_SANDBOX_SETUID="$enableval" ],[ CAPTIVE_SANDBOX_SETUID="captive" ])
+AC_ARG_ENABLE(sandbox-setgid,
+               [  --enable-sandbox-setgid=GROUP    non-privileged group for captive-sandbox-server (def.=captive)],
+               [ CAPTIVE_SANDBOX_SETGID="$enableval" ],[ CAPTIVE_SANDBOX_SETGID="captive" ])
+AC_ARG_ENABLE(sandbox-chroot,
+               [  --enable-sandbox-chroot=DIR      root-owned directory for captive-sandbox-server (def.=/var/lib/captive)],
+               [ CAPTIVE_SANDBOX_CHROOT="$enableval" ],[ CAPTIVE_SANDBOX_CHROOT="/var/lib/captive" ])
+AC_ARG_ENABLE(bug-replay,
+               [  --enable-bug-replay=no/yes/auto  compile debugging tool (def.=auto)],,enable_bug_replay=auto)
+AC_ARG_ENABLE(lufs,
+               [  --enable-lufs=no/yes/auto        compile LUFS filesystem module (def.=auto)],,enable_lufs=auto)
+AC_ARG_ENABLE(install-pkg,
+               [  --enable-install-pkg=no/yes/auto compile installation utils (def.=auto)],,enable_install_pkg=auto)
+
+
+# AC_ARG_ENABLE(sbin-mountdir,[--enable-sbin-mountdir=DIR],,[enable_sbin_mountdir="/sbin"])
+AM_CONDITIONAL(ENABLE_SBIN_MOUNT,[test "$enable_sbin_mount" != "no"])
+AC_SUBST(enable_sbin_mountdir)
+
+# AC_ARG_ENABLE(sbin-mount-fs,[--enable-sbin-mount-fs=FS1:FS2],,[enable_sbin_mount_fs="ntfs:fastfat:cdfs:ext2fsd"])
+AC_SUBST(enable_sbin_mount_fs)
+
+# AC_ARG_ENABLE(sandbox-setuid,[--enable-sandbox-setuid=USER],,[CAPTIVE_SANDBOX_SETUID="captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_SETUID,"$CAPTIVE_SANDBOX_SETUID",
                [non-privileged user  for captive-sandbox-server])
 
-AC_ARG_WITH(sandbox-setgid,
-               [  --with-sandbox-setgid=group   non-privileged group for captive-sandbox-server (def.=captive)],
-               [ CAPTIVE_SANDBOX_SETGID="$withval" ],[ CAPTIVE_SANDBOX_SETGID="captive" ])
+# AC_ARG_ENABLE(sandbox-setgid,[--enable-sandbox-setgid=GROUP],,[CAPTIVE_SANDBOX_SETGID="captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_SETGID,"$CAPTIVE_SANDBOX_SETGID",
                [non-privileged group for captive-sandbox-server])
 
-AC_ARG_WITH(sandbox-chroot,
-               [  --with-sandbox-chroot=dir     root-owned directory for captive-sandbox-server (def.=/var/lib/captive)],
-               [ CAPTIVE_SANDBOX_CHROOT="$withval" ],[ CAPTIVE_SANDBOX_CHROOT="/var/lib/captive" ])
+# AC_ARG_ENABLE(sandbox-chroot,[--enable-sandbox-chroot=DIR],,[CAPTIVE_SANDBOX_CHROOT="/var/lib/captive"])
 AC_DEFINE_UNQUOTED(CAPTIVE_SANDBOX_CHROOT,"$CAPTIVE_SANDBOX_CHROOT",
                [root-owned directory for captive-sandbox-server])
 AC_SUBST(CAPTIVE_SANDBOX_CHROOT)
 
+
 dnl Permit 'if NEVER' for Makefile.am-s; symbol 'FALSE' forbidden by automake
 AM_CONDITIONAL(NEVER,false)
 
+PERL=
+AC_PATH_PROGS(PERL,perl5 perl)
+if test '!' -f ./src/libcaptive/ke/exports.c -a -z "$PERL";then
+       AC_MSG_ERROR([perl(1) required as './src/libcaptive/ke/exports.c' is not found.])
+fi
+AM_CONDITIONAL(HAVE_PERL,test -n "$PERL")
+
 dnl Separate 'acconfig.h' is no longer recommended by autoconf
 AH_TOP([
 #ifndef _CAPTIVE_CONFIG_H
@@ -151,7 +172,7 @@ dnl popt
 AC_CHECK_LIB(popt,poptParseArgvString,[POPT_LIBS="-lpopt"],[AC_MSG_ERROR([Captive requires popt library.])])
 AC_SUBST(POPT_LIBS)
 
-AC_ARG_WITH(readline,  [  --with-readline=[no/yes/auto]        cmdline client with line editing (def.=auto)],,with_readline=auto)
+AC_ARG_WITH(readline,[  --with-readline=[no/yes/auto]  clients with line editing (def.=auto)],,with_readline=auto)
 AC_CHECK_HEADERS(readline/history.h)
 dnl Check for libraries, if needed by configuration options.
 if test "$with_readline" != "no"
@@ -166,7 +187,7 @@ then
                if test "x$need" != "x"
                then
                        captive_save_LIBS="$LIBS"
-                       AC_CHECK_LIB($need, main,,
+                       AC_CHECK_LIB($need,main,,
                                [ need_failed="$need_failed $need"
                                continue ]
                                )
@@ -191,7 +212,7 @@ then
        if $have_libreadline
        then
                AC_DEFINE(HAVE_LIBREADLINE,,[Use functions from libreadline?])
-               AC_CHECK_LIB(readline, add_history,
+               AC_CHECK_LIB(readline,add_history,
                        AC_DEFINE(HAVE_ADD_HISTORY,,[Use 'history' extension of libreadline?]),,
                        $READLINE_LIBS)
        else
@@ -201,9 +222,9 @@ then
                done
                if test "$with_readline" = "yes"
                then
-                       AC_MSG_ERROR([captive did not find the requested readline library for its cmdline client line editing capability.])
+                       AC_MSG_ERROR([captive did not find the requested readline library for its client line editing capability.])
                else
-                       AC_MSG_WARN([captive recommends readline library for its cmdline client line editing capability.])
+                       AC_MSG_WARN([captive recommends readline library for its client line editing capability.])
                fi
        fi
 fi
@@ -217,6 +238,7 @@ PKG_CHECK_MODULES(GNOME_VFS,gnome-vfs-2.0)
 AC_SUBST(GNOME_VFS_CFLAGS)
 AC_SUBST(GNOME_VFS_LIBS)
 
+# AC_ARG_ENABLE(bug-replay,[--enable-bug-replay=[no/yes/auto]],,enable_bug_replay=auto)
 dnl Check for 2.5.9 for: http://bugzilla.gnome.org/show_bug.cgi?id=117702
 dnl Check the version - impossible to reliably check the missing feature.
 PKG_CHECK_MODULES(LIBXML,libxml-2.0 >= 2.5.9,[ have_libxml_buffering=true ],[
@@ -225,9 +247,15 @@ PKG_CHECK_MODULES(LIBXML,libxml-2.0 >= 2.5.9,[ have_libxml_buffering=true ],[
        ])
 dnl We also condition 'HAVE_LIBXML_XMLREADER_H' by 'HAVE_LIBXML_BUFFERING'
 dnl as we have no use for xmlreader without working libxml buffering of 2.5.9.
-AM_CONDITIONAL(HAVE_LIBXML_BUFFERING,$have_libxml_buffering)
+AM_CONDITIONAL(ENABLE_BUG_REPLAY,[$have_libxml_buffering && test x$enable_bug_replay != xno])
 if $have_libxml_buffering;then
        AC_DEFINE(HAVE_LIBXML_BUFFERING,,[libxml2 correctly reads textnodes by its xmlTextReader.])
+else
+       if test x$enable_bug_replay = xyes;then
+               AC_MSG_ERROR([captive require libxml2 at least 2.5.9 for --enable-bug-replay feature.])
+       elif test x$enable_bug_replay != no;then
+               AC_MSG_WARN([libxml2 at least 2.5.9 required --enable-bug-replay feature; disabled now.])
+       fi
 fi
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
@@ -242,10 +270,22 @@ PKG_CHECK_MODULES(OPENSSL,openssl,,[
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
-have_lufs_includes=true
-AC_CHECK_HEADERS(lufs/fs.h lufs/proto.h,,[ have_lufs_includes=false ])
-AM_CONDITIONAL(HAVE_LUFS_INCLUDES,$have_lufs_includes)
-AC_CHECK_TYPES([struct lufs_sbattr],,,[#include <lufs/proto.h>])
+# AC_ARG_ENABLE(lufs,[--enable-lufs=[no/yes/auto]],,enable_lufs=auto)
+if test x$enable_lufs != no;then
+       have_lufs_includes=true
+       dnl If ACTION-IF-NOT-FOUND is given, it is executed when one of the header
+       dnl files is not found.
+       AC_CHECK_HEADERS(lufs/fs.h lufs/proto.h,,[ have_lufs_includes=false ])
+       AC_CHECK_TYPES([struct lufs_sbattr],,[
+               dnl FIXME: Include 'lufs' version when 'lufs_sbattr' gets integrated:
+               if $have_lufs_includes && test x$enable_lufs = xyes;then
+                       AC_MSG_ERROR([Although LUFS include files were found they are too old. You may also use --enable-lufs=auto.])
+               else
+                       AC_MSG_WARN([Although LUFS include files were found they are too old. df(1) will not show available NTFS disk space.])
+               fi
+               ],[#include <lufs/proto.h>])
+fi
+AM_CONDITIONAL(ENABLE_LUFS,[ $have_lufs_includes && test x$enable_lufs != no ])
 
 dnl for $(top_srcdir)/src/libcaptive/sandbox/split-sandbox.c
 AM_PATH_LINC(,,[AC_MSG_ERROR([Captive requires linc library used by ORBit.])])
@@ -255,15 +295,34 @@ dnl Do not use '[client server]' as $4 to prevent: configure: test: too many arg
 dnl  - currently this argument is not used by 'orbit2-config' in any way anyway
 AM_PATH_ORBIT2(,,[AC_MSG_ERROR([Captive requires ORBit library.])])
 
-AC_CHECK_LIB(ntfs,ntfs_mount,
-       [ LIBNTFS_LIBS="-lntfs" ],
-       [ LIBNTFS_LIBS="" ])
-AC_SUBST(LIBNTFS_LIBS)
-AM_CONDITIONAL(HAVE_LIBNTFS,test -n "$LIBNTFS_LIBS")
-
-PKG_CHECK_MODULES(GNOMEUI,libgnomeui-2.0)
+# AC_ARG_ENABLE(install-pkg,[--enable-install-pkg=[no/yes/auto]],,enable_install_pkg=auto)
+GLADE_W_INIT([
+       ./src/install/acquire/ui-gnome-interface.c
+       ./src/install/acquire/ui-gnome-interface.h
+       ./src/install/acquire/ui-gnome-callbacks.h
+       ./src/install/acquire/ui-gnome-support.c
+       ./src/install/acquire/ui-gnome-support.h
+       ],[$enable_install_pkg],[
+               AC_CHECK_LIB(ntfs,ntfs_mount,[
+                       LIBNTFS_LIBS="-lntfs"
+                       glade_addon=yes
+                       ])
+               ])
 AC_SUBST(GNOMEUI_CFLAGS)
 AC_SUBST(GNOMEUI_LIBS)
+AC_SUBST(LIBNTFS_LIBS)
+# Do not: AM_CONDITIONAL(HAVE_LIBNTFS,[ test -n "$LIBNTFS_LIBS" ])
+# as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
+AM_CONDITIONAL(HAVE_GLADE_WRITESOURCE,[ test "x$PATH_GLADE" != "x" ])
+# Do not: AM_CONDITIONAL(BUILD_GLADESRC,[ test "xyes" = "x$BUILD_GLADESRC" ])
+# as we do not need it as we are conditioned by ENABLE_INSTALL_PKG
+GNOME_ADDON_LIBS=""
+if test "x$BUILD_GLADESRC_TRUE" = "x"
+then
+       AC_CHECK_LIB(Xi,XOpenDevice,GNOME_ADDON_LIBS="$GNOME_ADDON_LIBS -lXi")
+fi
+AC_SUBST(GNOME_ADDON_LIBS)
+AM_CONDITIONAL(ENABLE_INSTALL_PKG,[ test "xyes" = "x$BUILD_GLADESRC" ])
 
 
 AC_SUBST(CFLAGS)
@@ -276,6 +335,7 @@ captive.spec
 ./src/client/gnomevfs/captive.conf
 ./src/client/lufs/mount.captive
 ./po/Makefile.in
+./macros/glade-w.sh
 Makefile
 ./macros/Makefile
 ./src/Makefile

diff --git a/debian/rules b/debian/rules
index 0b3d2b6..2a31557 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,16 +35,22 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
        INSTALL_PROGRAM += -s
 endif
 
+# FIXME: Use our own CFLAGS to prevent '-mcpu=i686' which up to gcc-20030214 gcc
+# will ignore stack freeing of attribute((stdcall)) callees in caller functions code.
+# Check at the final call of src/libcaptive/reactos/ntoskrnl/io/irp.c/IofCallDriver().
 config.status: configure
        dh_testdir
-       ./configure --prefix=/usr --sysconfdir=/etc \
+       CFLAGS="-O2" ./configure --prefix=/usr --sysconfdir=/etc \
                --enable-shared --disable-static \
                --with-readline \
-               --with-sandbox-setuid=captive \
-               --with-sandbox-setgid=captive \
-               --with-sandbox-chroot=/var/lib/captive \
-               --with-sbin-mountdir=/sbin \
-               --with-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
+               --disable-bug-replay \
+               --enable-lufs \
+               --enable-install-pkg \
+               --enable-sandbox-setuid=captive \
+               --enable-sandbox-setgid=captive \
+               --enable-sandbox-chroot=/var/lib/captive \
+               --enable-sbin-mountdir=/sbin \
+               --enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
                --disable-gtk-doc
 
 build-arch:  config.status build-arch-stamp

diff --git a/src/client/bug-replay/Makefile.am b/src/client/bug-replay/Makefile.am
index a844224..613ada2 100644 (file)
--- a/src/client/bug-replay/Makefile.am
+++ b/src/client/bug-replay/Makefile.am
@@ -23,7 +23,7 @@ captive_bug_replay_SOURCES= \
 captive_bug_replay_CFLAGS=                   $(LIBXML_CFLAGS) $(GNOME_VFS_CFLAGS)
 captive_bug_replay_LDADD =$(captive_library) $(LIBXML_LIBS)   $(GNOME_VFS_LIBS)
 
-if HAVE_LIBXML_BUFFERING
+if ENABLE_BUG_REPLAY
 captive_bug_replay_cond=captive-bug-replay
 endif
 bin_PROGRAMS+=$(captive_bug_replay_cond)

diff --git a/src/client/lufs/Makefile.am b/src/client/lufs/Makefile.am
index b0782dd..ee8e3c4 100644 (file)
--- a/src/client/lufs/Makefile.am
+++ b/src/client/lufs/Makefile.am
@@ -32,25 +32,25 @@ liblufs_captivefs_la_SOURCES= \
                captivefs-vfs.c \
                captivefs-vfs.h
 
-if HAVE_LUFS_INCLUDES
+if ENABLE_LUFS
 liblufs_captivefs_la_cond=liblufs-captivefs.la
 endif
 lib_LTLIBRARIES+=$(liblufs_captivefs_la_cond)
 
-if HAVE_LUFS_INCLUDES
-if WITH_SBIN_MOUNT
+if ENABLE_LUFS
+if ENABLE_SBIN_MOUNT
 sbin_mount_captive_cond=mount.captive
 install-exec-hook:
-       $(mkinstalldirs) $(DESTDIR)$(with_sbin_mountdir)
+       $(mkinstalldirs) $(DESTDIR)$(enable_sbin_mountdir)
        IFS=:; \
-       with_sbin_mount_fs="$(with_sbin_mount_fs)"; \
-       for fs in $$with_sbin_mount_fs; do \
+       enable_sbin_mount_fs="$(enable_sbin_mount_fs)"; \
+       for fs in $$enable_sbin_mount_fs; do \
                if test $$fs != no; then \
-                       $(RM) $(DESTDIR)$(with_sbin_mountdir)/mount.captive-$$fs; \
-                       $(LN_S) mount.captive $(DESTDIR)$(with_sbin_mountdir)/mount.captive-$$fs; \
+                       $(RM) $(DESTDIR)$(enable_sbin_mountdir)/mount.captive-$$fs; \
+                       $(LN_S) mount.captive $(DESTDIR)$(enable_sbin_mountdir)/mount.captive-$$fs; \
                fi; \
                done
 
 endif
 endif
-with_sbin_mount_SCRIPTS=$(sbin_mount_captive_cond)
+enable_sbin_mount_SCRIPTS=$(sbin_mount_captive_cond)

diff --git a/src/install/acquire/Makefile.am b/src/install/acquire/Makefile.am
index cc03a95..5132674 100644 (file)
--- a/src/install/acquire/Makefile.am
+++ b/src/install/acquire/Makefile.am
@@ -58,11 +58,14 @@ EXTRA_DIST+= \
 
 captive_install_acquire-ui-gnome-interface.$(OBJEXT): ui-gnome-callbacks.h
 
+if HAVE_GLADE_WRITESOURCE
 # touch(1) as 'ui-gnome-callbacks.h' are not overwritten if not changed:
 $(GLADE_OUT): $(GLADE_IN)
-       glade-2 --write-source $<
+       sh $(top_srcdir)/macros/glade-w.sh $<
        @touch ui-gnome-callbacks.h
 
+endif
+
 CLEANFILES+= \
                ui-gnome-callbacks.c \
                ui-gnome.glade.bak \
@@ -92,7 +95,7 @@ sysconf_DATA= \
                w32-mod-id.captivemodid.xml
 EXTRA_DIST+=$(sysconf_DATA)
 
-if HAVE_LIBNTFS
+if ENABLE_INSTALL_PKG
 captive_install_acquire_cond=captive-install-acquire
 endif
 sbin_PROGRAMS+=$(captive_install_acquire_cond)

diff --git a/src/install/fstab/Makefile.am b/src/install/fstab/Makefile.am
index e3656ea..5b6b711 100644 (file)
--- a/src/install/fstab/Makefile.am
+++ b/src/install/fstab/Makefile.am
@@ -23,7 +23,7 @@ captive_install_fstab_SOURCES= \
 captive_install_fstab_LDADD=../libcaptive-install/libcaptive-install.a
 captive_install_fstab_LDADD+=$(LIBNTFS_LIBS) $(POPT_LIBS)
 
-if HAVE_LIBNTFS
+if ENABLE_INSTALL_PKG
 captive_install_fstab_cond=captive-install-fstab
 endif
 sbin_PROGRAMS+=$(captive_install_fstab_cond)

diff --git a/src/install/libcaptive-install/Makefile.am b/src/install/libcaptive-install/Makefile.am
index 89b186f..acd98e5 100644 (file)
--- a/src/install/libcaptive-install/Makefile.am
+++ b/src/install/libcaptive-install/Makefile.am
@@ -22,7 +22,7 @@ libcaptive_install_a_SOURCES= \
                proc_partitions.c \
                proc_partitions.h
 
-if HAVE_LIBNTFS
+if ENABLE_INSTALL_PKG
 libcaptive_install_a_cond=libcaptive-install.a
 endif
 noinst_LIBRARIES=$(libcaptive_install_a_cond)

diff --git a/src/libcaptive/cc/Makefile.am b/src/libcaptive/cc/Makefile.am
index 06cbc4f..67ae8e8 100644 (file)
--- a/src/libcaptive/cc/Makefile.am
+++ b/src/libcaptive/cc/Makefile.am
@@ -48,10 +48,10 @@ libcc_la_SOURCES= \
                sharedcachemap.h
 
 marshallers.h: marshallers.list
-          glib-genmarshal --prefix=captive_cc $< --header >$@
+       $(GLIB_GENMARSHAL) --prefix=captive_cc $< --header >$@
 
 marshallers.c: marshallers.list
-          glib-genmarshal --prefix=captive_cc $< --body >$@
+       $(GLIB_GENMARSHAL) --prefix=captive_cc $< --body >$@
 
 EXTRA_DIST+= \
                marshallers.list

diff --git a/src/libcaptive/client/Makefile.am b/src/libcaptive/client/Makefile.am
index adcc308..256be0c 100644 (file)
--- a/src/libcaptive/client/Makefile.am
+++ b/src/libcaptive/client/Makefile.am
@@ -62,10 +62,10 @@ libclient_la_LIBADD= \
                $(GNOME_VFS_MODULE_LIBS)   $(OPENSSL_LIBS)   $(LIBXML_LIBS)
 
 marshallers.h: marshallers.list
-          glib-genmarshal --prefix=captive_client $< --header >$@
+       $(GLIB_GENMARSHAL) --prefix=captive_client $< --header >$@
 
 marshallers.c: marshallers.list
-          glib-genmarshal --prefix=captive_client $< --body >$@
+       $(GLIB_GENMARSHAL) --prefix=captive_client $< --body >$@
 
 EXTRA_DIST+= \
                marshallers.list

diff --git a/src/libcaptive/ke/Makefile.am b/src/libcaptive/ke/Makefile.am
index cbeb473..41d2517 100644 (file)
--- a/src/libcaptive/ke/Makefile.am
+++ b/src/libcaptive/ke/Makefile.am
@@ -45,6 +45,9 @@ BUILT_SOURCES+=exports.c
 CLEANFILES+=exports.c
 libke_la_SOURCES+=exports.c
 
+if HAVE_PERL
 # FIXME: a difference between "ntoskrnl/ntoskrnl.def" vs. "ntoskrnl/ntoskrnl.edf"?
 exports.c: exports.captivesym captivesym.pl exports.def $(top_srcdir)/reactos/ntoskrnl/ntoskrnl.def $(top_srcdir)/reactos/hal/hal/hal.def
-       perl captivesym.pl $(top_srcdir)/reactos/ntoskrnl/ntoskrnl.def $(top_srcdir)/reactos/hal/hal/hal.def exports.def $< >$@
+       $(PERL) captivesym.pl $(top_srcdir)/reactos/ntoskrnl/ntoskrnl.def $(top_srcdir)/reactos/hal/hal/hal.def exports.def $< >$@
+
+endif