Fixed a compiling problem

This commit is contained in:
Zane U. Ji 2014-06-01 23:16:43 +08:00
parent ed8f8e9c64
commit 0fed15b93b
7 changed files with 97 additions and 1 deletions

View File

@ -108,6 +108,7 @@ ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@ ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDATA_VALIDATE = @APPDATA_VALIDATE@
AR = @AR@ AR = @AR@
ASPELL_LIBS = @ASPELL_LIBS@ ASPELL_LIBS = @ASPELL_LIBS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
@ -127,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@

85
configure vendored
View File

@ -714,6 +714,8 @@ INTLTOOL_MERGE
INTLTOOL_UPDATE INTLTOOL_UPDATE
USE_NLS USE_NLS
GETTEXT_PACKAGE GETTEXT_PACKAGE
DESKTOP_FILE_VALIDATE
APPDATA_VALIDATE
am__untar am__untar
am__tar am__tar
AMTAR AMTAR
@ -2973,6 +2975,89 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
# Extract the first word of "appdata-validate", so it can be a program name with args.
set dummy appdata-validate; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_APPDATA_VALIDATE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $APPDATA_VALIDATE in
[\\/]* | ?:[\\/]*)
ac_cv_path_APPDATA_VALIDATE="$APPDATA_VALIDATE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_APPDATA_VALIDATE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_APPDATA_VALIDATE" && ac_cv_path_APPDATA_VALIDATE="/bin/true"
;;
esac
fi
APPDATA_VALIDATE=$ac_cv_path_APPDATA_VALIDATE
if test -n "$APPDATA_VALIDATE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPDATA_VALIDATE" >&5
$as_echo "$APPDATA_VALIDATE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
# Extract the first word of "desktop-file-validate", so it can be a program name with args.
set dummy desktop-file-validate; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_DESKTOP_FILE_VALIDATE+:} false; then :
$as_echo_n "(cached) " >&6
else
case $DESKTOP_FILE_VALIDATE in
[\\/]* | ?:[\\/]*)
ac_cv_path_DESKTOP_FILE_VALIDATE="$DESKTOP_FILE_VALIDATE" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_DESKTOP_FILE_VALIDATE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_DESKTOP_FILE_VALIDATE" && ac_cv_path_DESKTOP_FILE_VALIDATE="/bin/true"
;;
esac
fi
DESKTOP_FILE_VALIDATE=$ac_cv_path_DESKTOP_FILE_VALIDATE
if test -n "$DESKTOP_FILE_VALIDATE"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DESKTOP_FILE_VALIDATE" >&5
$as_echo "$DESKTOP_FILE_VALIDATE" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
GETTEXT_PACKAGE=xmlcopyeditor GETTEXT_PACKAGE=xmlcopyeditor

View File

@ -4,6 +4,9 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 foreign]) AM_INIT_AUTOMAKE([1.11 foreign])
AC_PATH_PROG([APPDATA_VALIDATE], [appdata-validate], [/bin/true])
AC_PATH_PROG([DESKTOP_FILE_VALIDATE], [desktop-file-validate], [/bin/true])
GETTEXT_PACKAGE=AC_PACKAGE_NAME GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])

View File

@ -79,6 +79,7 @@ ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@ ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDATA_VALIDATE = @APPDATA_VALIDATE@
AR = @AR@ AR = @AR@
ASPELL_LIBS = @ASPELL_LIBS@ ASPELL_LIBS = @ASPELL_LIBS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
@ -98,6 +99,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@

View File

@ -7,4 +7,4 @@ Exec=xmlcopyeditor %U
Icon=xmlcopyeditor Icon=xmlcopyeditor
Terminal=false Terminal=false
MimeType=text/xml; MimeType=text/xml;
Categories=Development;TextEditor; Categories=Development;Utility;TextEditor;

View File

@ -49,6 +49,7 @@ ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@ ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDATA_VALIDATE = @APPDATA_VALIDATE@
AR = @AR@ AR = @AR@
ASPELL_LIBS = @ASPELL_LIBS@ ASPELL_LIBS = @ASPELL_LIBS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
@ -68,6 +69,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@

View File

@ -135,6 +135,7 @@ ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@ ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@ AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPDATA_VALIDATE = @APPDATA_VALIDATE@
AR = @AR@ AR = @AR@
ASPELL_LIBS = @ASPELL_LIBS@ ASPELL_LIBS = @ASPELL_LIBS@
AUTOCONF = @AUTOCONF@ AUTOCONF = @AUTOCONF@
@ -154,6 +155,7 @@ CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@ DATADIRNAME = @DATADIRNAME@
DEFS = @DEFS@ DEFS = @DEFS@
DEPDIR = @DEPDIR@ DEPDIR = @DEPDIR@
DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@
DLLTOOL = @DLLTOOL@ DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@ DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@ DUMPBIN = @DUMPBIN@