diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-01-21 09:51:43 -0800 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2016-01-22 11:32:39 +0000 |
| commit | 0c176a91d53c85cdacd7917c76d6f659125ac3f6 (patch) | |
| tree | 7658b0afd34d548a1a8ee9fa29a9d03f6236d0eb /ijs/configure | |
| parent | fd63655e199fbfcda8e52c873b3a28bf27914c93 (diff) | |
| download | ghostpdl-0c176a91d53c85cdacd7917c76d6f659125ac3f6.tar.gz | |
Bug 696528: kill off ijs-config
The custom ijs-config tool gives different include paths than pkg-config
(-I${INCLUDE_PATH}/ijs vs. -I${INCLUDE_PATH}/), which can be confusing
for developers using this library. pkg-config is more standard anyway,
so just kill the custom tool.
Diffstat (limited to 'ijs/configure')
| -rwxr-xr-x | ijs/configure | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ijs/configure b/ijs/configure index d3d340977..de43e3ec8 100755 --- a/ijs/configure +++ b/ijs/configure @@ -2153,7 +2153,7 @@ IJS_VERSION=0.35 -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2354,8 +2354,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2374,7 +2374,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2702,8 +2702,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2770,6 +2770,7 @@ fi + LT_RELEASE=$IJS_MAJOR_VERSION.$IJS_MINOR_VERSION LT_CURRENT=$IJS_CURRENT_INTERFACE LT_REVISION=$IJS_INTERFACE_AGE @@ -12323,8 +12324,6 @@ LIBIJS_LIBS="${LIBIJS_LIBS} ${IJS_DEPLIBS}" ac_config_files="$ac_config_files Makefile" -ac_config_files="$ac_config_files ijs-config" - ac_config_files="$ac_config_files ijs.pc" cat >confcache <<\_ACEOF @@ -13356,7 +13355,6 @@ do "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "ijs-config") CONFIG_FILES="$CONFIG_FILES ijs-config" ;; "ijs.pc") CONFIG_FILES="$CONFIG_FILES ijs.pc" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -14510,7 +14508,6 @@ fi chmod +x "$ofile" ;; - "ijs-config":F) chmod +x ijs-config ;; esac done # for ac_tag |