mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-04-22 23:11:15 +00:00
* regenerate configure from configure.ac
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@36237 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
buzzdee
parent
9cdb86e4d9
commit
308c676de9
2 changed files with 138 additions and 3 deletions
|
|
@ -1,4 +1,7 @@
|
|||
2013-03-01 David Wetzel <dave@turbocat.de>
|
||||
2013-03-02 Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
|
||||
* regenerate configure from configure.ac
|
||||
|
||||
2013-03-02 David Wetzel <dave@turbocat.de>
|
||||
add GSWDatabase/Makefile.preamble patch from Sebastian Reitenbach
|
||||
|
||||
2013-03-01 David Wetzel <dave@turbocat.de>
|
||||
|
|
|
|||
136
configure
vendored
136
configure
vendored
|
|
@ -3148,7 +3148,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|||
else
|
||||
ac_cv_header_stdc=no
|
||||
fi
|
||||
rm -f -r conftest*
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -3169,7 +3169,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|||
else
|
||||
ac_cv_header_stdc=no
|
||||
fi
|
||||
rm -f -r conftest*
|
||||
rm -f conftest*
|
||||
|
||||
fi
|
||||
|
||||
|
|
@ -4050,6 +4050,138 @@ fi
|
|||
|
||||
if test $enable_png = yes; then
|
||||
|
||||
PNG_CPPFLAGS="`pkg-config --cflags libpng`"
|
||||
CPPFLAGS="$CPPFLAGS $PNG_CPPFLAGS"
|
||||
AUX_INCS="$AUX_INCS $PNG_CPPFLAGS"
|
||||
if test "${ac_cv_header_png_h+set}" = set; then
|
||||
{ echo "$as_me:$LINENO: checking for png.h" >&5
|
||||
echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_png_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
|
||||
else
|
||||
# Is the header compilable?
|
||||
{ echo "$as_me:$LINENO: checking png.h usability" >&5
|
||||
echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
$ac_includes_default
|
||||
#include <png.h>
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (ac_try="$ac_compile"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_compile") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } && {
|
||||
test -z "$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
} && test -s conftest.$ac_objext; then
|
||||
ac_header_compiler=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_compiler=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
|
||||
echo "${ECHO_T}$ac_header_compiler" >&6; }
|
||||
|
||||
# Is the header present?
|
||||
{ echo "$as_me:$LINENO: checking png.h presence" >&5
|
||||
echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; }
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <png.h>
|
||||
_ACEOF
|
||||
if { (ac_try="$ac_cpp conftest.$ac_ext"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } >/dev/null && {
|
||||
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
|
||||
test ! -s conftest.err
|
||||
}; then
|
||||
ac_header_preproc=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_header_preproc=no
|
||||
fi
|
||||
|
||||
rm -f conftest.err conftest.$ac_ext
|
||||
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
|
||||
echo "${ECHO_T}$ac_header_preproc" >&6; }
|
||||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||||
yes:no: )
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
|
||||
echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
|
||||
ac_header_preproc=yes
|
||||
;;
|
||||
no:yes:* )
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
|
||||
echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5
|
||||
echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
|
||||
echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5
|
||||
echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
|
||||
echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
|
||||
echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
|
||||
|
||||
;;
|
||||
esac
|
||||
{ echo "$as_me:$LINENO: checking for png.h" >&5
|
||||
echo $ECHO_N "checking for png.h... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_header_png_h+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_cv_header_png_h=$ac_header_preproc
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
|
||||
echo "${ECHO_T}$ac_cv_header_png_h" >&6; }
|
||||
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
|
||||
echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue