You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
105 lines
2.9 KiB
105 lines
2.9 KiB
--- desktop-file-utils-0.8/configure.in.embedded 2004-09-02 21:05:32.076847032 +0100
|
|
+++ desktop-file-utils-0.8/configure.in 2004-09-02 21:05:43.296141440 +0100
|
|
@@ -108,13 +108,11 @@
|
|
AC_SUBST(DESKTOP_FILE_UTILS_CFLAGS)
|
|
AC_SUBST(DESKTOP_FILE_UTILS_LIBS)
|
|
|
|
-GNOME_VFS_REQUIRED=2.2.0
|
|
-
|
|
-PKG_CHECK_MODULES(VFS, gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED gnome-vfs-module-2.0 >= $GNOME_VFS_REQUIRED, have_gnome_vfs=yes, have_gnome_vfs=no)
|
|
+VFS_CFLAGS=`PKG_CONFIG_PATH=./; export PKG_CONFIG_PATH; pkgconfig --cflags gnome-vfs2`
|
|
+VFS_LIBS=`PKG_CONFIG_PATH=./; export PKG_CONFIG_PATH; pkgconfig --libs gnome-vfs2`
|
|
AC_SUBST(VFS_CFLAGS)
|
|
AC_SUBST(VFS_LIBS)
|
|
-
|
|
-AM_CONDITIONAL(HAVE_GNOME_VFS, test x$have_gnome_vfs = xyes)
|
|
+AM_CONDITIONAL(HAVE_GNOME_VFS, test xyes = xyes)
|
|
|
|
AM_PATH_LISPDIR
|
|
|
|
--- desktop-file-utils-0.8/src/Makefile.am.embedded 2004-09-02 21:09:51.781365944 +0100
|
|
+++ desktop-file-utils-0.8/src/Makefile.am 2004-09-02 21:10:57.966304304 +0100
|
|
@@ -1,5 +1,6 @@
|
|
|
|
INCLUDES=$(DESKTOP_FILE_UTILS_CFLAGS) -DDATADIR="\"$(datadir)\"" $(VFS_CFLAGS) \
|
|
+ -I../../ \
|
|
-DSYSCONFDIR="\"$(sysconfdir)\"" \
|
|
-DPREFIX="\"$(prefix)\"" \
|
|
-D_FILE_OFFSET_BITS=64 \
|
|
@@ -8,21 +9,6 @@
|
|
-D_REENTRANT \
|
|
-D_POSIX_PTHREAD_SEMANTICS
|
|
|
|
-## note that TESTS has special meaning (stuff to use in make check)
|
|
-## so if adding tests not to be run in make check, don't add them to
|
|
-## TESTS
|
|
-if DFU_BUILD_TESTS
|
|
-TESTS_ENVIRONMENT=
|
|
-TESTS=dfu-test
|
|
-else
|
|
-TESTS=
|
|
-endif
|
|
-
|
|
-## we use noinst_PROGRAMS not check_PROGRAMS so that we build
|
|
-## even when not doing "make check"
|
|
-noinst_PROGRAMS=$(TESTS)
|
|
-
|
|
-bin_PROGRAMS=desktop-file-validate desktop-file-install desktop-menu-tool update-desktop-database
|
|
noinst_LTLIBRARIES = libmenu_sources.la
|
|
|
|
menu_sources= \
|
|
@@ -49,53 +35,7 @@
|
|
libmenu_sources_la_SOURCES= \
|
|
$(menu_sources)
|
|
|
|
-desktop_file_validate_SOURCES= \
|
|
- desktop_file.c \
|
|
- desktop_file.h \
|
|
- validate.c \
|
|
- validate.h \
|
|
- validator.c
|
|
-
|
|
-desktop_file_install_SOURCES= \
|
|
- desktop_file.c \
|
|
- desktop_file.h \
|
|
- validate.c \
|
|
- validate.h \
|
|
- install.c
|
|
-
|
|
-desktop_menu_tool_SOURCES= \
|
|
- desktop_file.c \
|
|
- desktop_file.h \
|
|
- gen-compat-tree.c \
|
|
- validate.c \
|
|
- validate.h \
|
|
- vfolder-parser.c \
|
|
- vfolder-parser.h \
|
|
- vfolder-query.c \
|
|
- vfolder-query.h
|
|
-
|
|
-dfu_test_SOURCES= \
|
|
- dfu-test.h \
|
|
- dfu-test.c
|
|
-
|
|
-update_desktop_database_SOURCES= \
|
|
- update-desktop-database.c \
|
|
- eggdesktopentries.c \
|
|
- eggdesktopentries.h \
|
|
- eggintl.h \
|
|
- eggdirfuncs.c \
|
|
- eggdirfuncs.h
|
|
-
|
|
-desktop_file_validate_LDADD=$(DESKTOP_FILE_UTILS_LIBS)
|
|
-desktop_file_install_LDADD= $(DESKTOP_FILE_UTILS_LIBS)
|
|
-desktop_menu_tool_LDADD=$(DESKTOP_FILE_UTILS_LIBS) libmenu_sources.la
|
|
-dfu_test_LDADD=$(DESKTOP_FILE_UTILS_LIBS) libmenu_sources.la
|
|
-update_desktop_database_LDADD = $(DESKTOP_FILE_UTILS_LIBS)
|
|
-
|
|
-
|
|
EXTRA_DIST = \
|
|
- $(dfu_test_SOURCES) \
|
|
- $(update_desktop_database_SOURCES) \
|
|
menu-modules.conf
|
|
|
|
if HAVE_GNOME_VFS
|