ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Merge branch 'master' into kyua

pull/100/head
William Pitcock 2016-11-04 22:36:40 -05:00
parent 64c07aa90f febf476a91
commit 0764d8af51
3 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -22,23 +22,6 @@ LT_INIT
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_ARG_ENABLE([strict],
[AC_HELP_STRING([--enable-strict],
[enable POSIX-strict argument checking and disable some workarounds])],
[ac_cv_use_strict=$enableval], [ac_cv_use_strict=no])
AC_CACHE_CHECK([whether to enable strict mode],
[ac_cv_use_strict], [ac_cv_use_strict=no])
if test "x$ac_cv_use_strict" = "xyes"; then
AC_DEFINE([HAVE_STRICT_MODE], [1], [Define if strict mode is requested.])
STRICT_MODE=yes
else
AC_DEFINE([HAVE_STRICT_MODE], [0], [Define if strict mode is requested.])
STRICT_MODE=no
fi
AC_SUBST([STRICT_MODE])
AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify
the place where pc files will be found])],PKGCONFIGDIR="$withval", the place where pc files will be found])],PKGCONFIGDIR="$withval",
PKGCONFIGDIR="${libdir}/pkgconfig:${datadir}/pkgconfig") PKGCONFIGDIR="${libdir}/pkgconfig:${datadir}/pkgconfig")

8
getopt_long.c
View File

@ -66,10 +66,6 @@
#define PKGCONF_HACK_LOGICAL_OR_ALL_VALUES #define PKGCONF_HACK_LOGICAL_OR_ALL_VALUES
#if HAVE_STRICT_MODE > 0
# define GNU_COMPATIBLE /* Be more compatible, configure's use us! */
#endif
int pkg_opterr = 1; /* if error message should be printed */ int pkg_opterr = 1; /* if error message should be printed */
int pkg_optind = 1; /* index into parent argv vector */ int pkg_optind = 1; /* index into parent argv vector */
int pkg_optopt = '?'; /* character checked for validity */ int pkg_optopt = '?'; /* character checked for validity */
@ -395,9 +391,7 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
else if (*options == '-') else if (*options == '-')
flags |= FLAG_ALLARGS; flags |= FLAG_ALLARGS;
#endif #endif
#if HAVE_STRICT_MODE >= 1
flags &= ~FLAG_PERMUTE;
#endif
if (*options == '+' || *options == '-') if (*options == '+' || *options == '-')
options++; options++;

10
tests/run.sh.in
View File

@ -440,16 +440,6 @@ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs 'provides-test-meow <= 1
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs 'provides-test-meow <= 1.2.9'; echo \$?" \ run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --libs 'provides-test-meow <= 1.2.9'; echo \$?" \
"0" "0"
# 11) tests for internal getopt implementation with options at the end
if [ "x@STRICT_MODE@" = "xno" ]; then
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} foo --libs" \
'-lfoo'
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} foo --cflags --libs" \
'-lfoo' '-I/test/include/foo' '-fPIC'
run_test "PKG_CONFIG_PATH='${selfdir}/lib1' ${1} --cflags foo --libs" \
'-lfoo' '-I/test/include/foo' '-fPIC'
fi
run_test "${1} --blah; echo \$?" \ run_test "${1} --blah; echo \$?" \
'1' '1'