Search
lxdream.org :: lxdream :: r471:826c89a6f12c
lxdream 0.9.1
released Jun 29
Download Now
changeset471:826c89a6f12c
parent470:e09a16196693
child472:8a3ae91eb215
authornkeynes
dateWed Oct 31 09:00:50 2007 +0000 (12 years ago)
Add libpng as a dependency
configure
configure.in
1.1 --- a/configure Sun Oct 28 08:29:29 2007 +0000
1.2 +++ b/configure Wed Oct 31 09:00:50 2007 +0000
1.3 @@ -4947,12 +4947,12 @@
1.4 pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS"
1.5 else
1.6 if test -n "$PKG_CONFIG" && \
1.7 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libgnomeui-2.0 esound \"") >&5
1.8 - ($PKG_CONFIG --exists --print-errors " libgnomeui-2.0 esound ") 2>&5
1.9 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libgnomeui-2.0 esound libpng \"") >&5
1.10 + ($PKG_CONFIG --exists --print-errors " libgnomeui-2.0 esound libpng ") 2>&5
1.11 ac_status=$?
1.12 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.13 (exit $ac_status); }; then
1.14 - pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags " libgnomeui-2.0 esound " 2>/dev/null`
1.15 + pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags " libgnomeui-2.0 esound libpng " 2>/dev/null`
1.16 else
1.17 pkg_failed=yes
1.18 fi
1.19 @@ -4965,12 +4965,12 @@
1.20 pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS"
1.21 else
1.22 if test -n "$PKG_CONFIG" && \
1.23 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libgnomeui-2.0 esound \"") >&5
1.24 - ($PKG_CONFIG --exists --print-errors " libgnomeui-2.0 esound ") 2>&5
1.25 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" libgnomeui-2.0 esound libpng \"") >&5
1.26 + ($PKG_CONFIG --exists --print-errors " libgnomeui-2.0 esound libpng ") 2>&5
1.27 ac_status=$?
1.28 echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.29 (exit $ac_status); }; then
1.30 - pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs " libgnomeui-2.0 esound " 2>/dev/null`
1.31 + pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs " libgnomeui-2.0 esound libpng " 2>/dev/null`
1.32 else
1.33 pkg_failed=yes
1.34 fi
1.35 @@ -4989,14 +4989,14 @@
1.36 _pkg_short_errors_supported=no
1.37 fi
1.38 if test $_pkg_short_errors_supported = yes; then
1.39 - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libgnomeui-2.0 esound "`
1.40 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " libgnomeui-2.0 esound libpng "`
1.41 else
1.42 - PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libgnomeui-2.0 esound "`
1.43 + PACKAGE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libgnomeui-2.0 esound libpng "`
1.44 fi
1.45 # Put the nasty error message in config.log where it belongs
1.46 echo "$PACKAGE_PKG_ERRORS" >&5
1.47
1.48 - { { echo "$as_me:$LINENO: error: Package requirements ( libgnomeui-2.0 esound ) were not met:
1.49 + { { echo "$as_me:$LINENO: error: Package requirements ( libgnomeui-2.0 esound libpng ) were not met:
1.50
1.51 $PACKAGE_PKG_ERRORS
1.52
1.53 @@ -5007,7 +5007,7 @@
1.54 and PACKAGE_LIBS to avoid the need to call pkg-config.
1.55 See the pkg-config man page for more details.
1.56 " >&5
1.57 -echo "$as_me: error: Package requirements ( libgnomeui-2.0 esound ) were not met:
1.58 +echo "$as_me: error: Package requirements ( libgnomeui-2.0 esound libpng ) were not met:
1.59
1.60 $PACKAGE_PKG_ERRORS
1.61
1.62 @@ -5052,6 +5052,77 @@
1.63
1.64
1.65
1.66 +{ echo "$as_me:$LINENO: checking for ucompress in -lz" >&5
1.67 +echo $ECHO_N "checking for ucompress in -lz... $ECHO_C" >&6; }
1.68 +if test "${ac_cv_lib_z_ucompress+set}" = set; then
1.69 + echo $ECHO_N "(cached) $ECHO_C" >&6
1.70 +else
1.71 + ac_check_lib_save_LIBS=$LIBS
1.72 +LIBS="-lz $LIBS"
1.73 +cat >conftest.$ac_ext <<_ACEOF
1.74 +/* confdefs.h. */
1.75 +_ACEOF
1.76 +cat confdefs.h >>conftest.$ac_ext
1.77 +cat >>conftest.$ac_ext <<_ACEOF
1.78 +/* end confdefs.h. */
1.79 +
1.80 +/* Override any GCC internal prototype to avoid an error.
1.81 + Use char because int might match the return type of a GCC
1.82 + builtin and then its argument prototype would still apply. */
1.83 +#ifdef __cplusplus
1.84 +extern "C"
1.85 +#endif
1.86 +char ucompress ();
1.87 +int
1.88 +main ()
1.89 +{
1.90 +return ucompress ();
1.91 + ;
1.92 + return 0;
1.93 +}
1.94 +_ACEOF
1.95 +rm -f conftest.$ac_objext conftest$ac_exeext
1.96 +if { (ac_try="$ac_link"
1.97 +case "(($ac_try" in
1.98 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1.99 + *) ac_try_echo=$ac_try;;
1.100 +esac
1.101 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1.102 + (eval "$ac_link") 2>conftest.er1
1.103 + ac_status=$?
1.104 + grep -v '^ *+' conftest.er1 >conftest.err
1.105 + rm -f conftest.er1
1.106 + cat conftest.err >&5
1.107 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1.108 + (exit $ac_status); } && {
1.109 + test -z "$ac_c_werror_flag" ||
1.110 + test ! -s conftest.err
1.111 + } && test -s conftest$ac_exeext &&
1.112 + $as_test_x conftest$ac_exeext; then
1.113 + ac_cv_lib_z_ucompress=yes
1.114 +else
1.115 + echo "$as_me: failed program was:" >&5
1.116 +sed 's/^/| /' conftest.$ac_ext >&5
1.117 +
1.118 + ac_cv_lib_z_ucompress=no
1.119 +fi
1.120 +
1.121 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1.122 + conftest$ac_exeext conftest.$ac_ext
1.123 +LIBS=$ac_check_lib_save_LIBS
1.124 +fi
1.125 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_ucompress" >&5
1.126 +echo "${ECHO_T}$ac_cv_lib_z_ucompress" >&6; }
1.127 +if test $ac_cv_lib_z_ucompress = yes; then
1.128 + cat >>confdefs.h <<_ACEOF
1.129 +#define HAVE_LIBZ 1
1.130 +_ACEOF
1.131 +
1.132 + LIBS="-lz $LIBS"
1.133 +
1.134 +fi
1.135 +
1.136 +
1.137 { echo "$as_me:$LINENO: checking for glXQueryVersion in -lGL" >&5
1.138 echo $ECHO_N "checking for glXQueryVersion in -lGL... $ECHO_C" >&6; }
1.139 if test "${ac_cv_lib_GL_glXQueryVersion+set}" = set; then
2.1 --- a/configure.in Sun Oct 28 08:29:29 2007 +0000
2.2 +++ b/configure.in Wed Oct 31 09:00:50 2007 +0000
2.3 @@ -12,10 +12,12 @@
2.4
2.5 PKG_CHECK_MODULES(PACKAGE,
2.6 [ libgnomeui-2.0 dnl
2.7 - esound ])
2.8 + esound dnl
2.9 + libpng ])
2.10 AC_SUBST(PACKAGE_CFLAGS)
2.11 AC_SUBST(PACKAGE_LIBS)
2.12
2.13 +AC_CHECK_LIB(z, ucompress)
2.14 AC_CHECK_LIB(GL, glXQueryVersion)
2.15
2.16 GETTEXT_PACKAGE=dream
.