spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adding macros directory to autoconf automatically and updating gconf m4 

macro.
ver1_5_1
Pat Suwalski 2008-01-25 01:04:48 +00:00
parent 9b108c2d58
commit 564311b8b1
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,3 +1,5 @@
ACLOCAL_AMFLAGS = -I macros
pkgdatadir = @datadir@/@PACKAGE@
dosstuff = \

17
macros/gconf-2.m4
View File

@ -5,7 +5,7 @@ dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
dnl you should install foo.schemas files
dnl
AC_DEFUN(AM_GCONF_SOURCE_2,
AC_DEFUN([AM_GCONF_SOURCE_2],
[
if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@ -20,9 +20,7 @@ AC_DEFUN(AM_GCONF_SOURCE_2,
AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas/'
else
GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR
GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
fi
AC_ARG_WITH(gconf-schema-file-dir,
@ -33,10 +31,9 @@ AC_DEFUN(AM_GCONF_SOURCE_2,
AC_ARG_ENABLE(schemas-install,
[ --disable-schemas-install Disable the schemas installation],
[case "${enableval}" in
yes) schemas_install=true ;;
no) schemas_install=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --disable-schemas-install) ;;
esac],[schemas_install=true])
AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue)
[case ${enableval} in
yes|no) ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;;
esac])
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
])