milkytracker/no_zziplib_dep.patch

   1 *** milkytracker-0.90.85/configure.in   2009-09-17 20:35:47.231496000 +0100
   2 --- milkytracker-trunk/configure.in     2010-01-05 10:03:17.292774154 +0000
   3 ***************
   4 *** 43,49 ****
   5
   6   AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
   7   #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
   8 ! PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
   9
  10   SDL_VERSION=1.2.0
  11   AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
  12 --- 43,49 ----
  13
  14   AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
  15   #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
  16 ! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
  17
  18   SDL_VERSION=1.2.0
  19   AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
  20 *** milkytracker-0.90.85/configure      2010-01-02 00:03:37.602601121 +0000
  21 --- milkytracker-trunk/configure        2010-01-05 10:03:38.372781464 +0000
  22 ***************
  23 *** 599,607 ****
  24   SDL_LIBS
  25   SDL_CFLAGS
  26   SDL_CONFIG
  27 - ZZIP_LIBS
  28 - ZZIP_CFLAGS
  29 - PKG_CONFIG
  30   ALSA_LIBS
  31   ALSA_CFLAGS
  32   RTMIDI_DIR
  33 --- 599,604 ----
  34 ***************
  35 *** 717,726 ****
  36   CCC
  37   CC
  38   CFLAGS
  39 ! CPP
  40 ! PKG_CONFIG
  41 ! ZZIP_CFLAGS
  42 ! ZZIP_LIBS'
  43
  44
  45   # Initialize some variables set by options.
  46 --- 714,720 ----
  47   CCC
  48   CC
  49   CFLAGS
  50 ! CPP'
  51
  52
  53   # Initialize some variables set by options.
  54 ***************
  55 *** 1363,1371 ****
  56     CC          C compiler command
  57     CFLAGS      C compiler flags
  58     CPP         C preprocessor
  59 -   PKG_CONFIG  path to pkg-config utility
  60 -   ZZIP_CFLAGS C compiler flags for ZZIP, overriding pkg-config
  61 -   ZZIP_LIBS   linker flags for ZZIP, overriding pkg-config
  62
  63   Use these variables to override the choices made by `configure' or to help
  64   it to find libraries and programs with nonstandard names/locations.
  65 --- 1357,1362 ----
  66 ***************
  67 *** 5313,5524 ****
  68   fi
  69
  70   #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
  71 !
  72 !
  73 ! if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
  74 !       if test -n "$ac_tool_prefix"; then
  75 !   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  76 ! set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
  77 ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  78 ! $as_echo_n "checking for $ac_word... " >&6; }
  79 ! if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  80 !   $as_echo_n "(cached) " >&6
  81 ! else
  82 !   case $PKG_CONFIG in
  83 !   [\\/]* | ?:[\\/]*)
  84 !   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
  85 !   ;;
  86 !   *)
  87 !   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  88 ! for as_dir in $PATH
  89 ! do
  90 !   IFS=$as_save_IFS
  91 !   test -z "$as_dir" && as_dir=.
  92 !     for ac_exec_ext in '' $ac_executable_extensions; do
  93 !   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  94 !     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  95 !     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  96 !     break 2
  97 !   fi
  98 ! done
  99 !   done
 100 ! IFS=$as_save_IFS
 101 !
 102 !   ;;
 103 ! esac
 104 ! fi
 105 ! PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 106 ! if test -n "$PKG_CONFIG"; then
 107 !   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 108 ! $as_echo "$PKG_CONFIG" >&6; }
 109 ! else
 110 !   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 111 ! $as_echo "no" >&6; }
 112 ! fi
 113 !
 114 !
 115 ! fi
 116 ! if test -z "$ac_cv_path_PKG_CONFIG"; then
 117 !   ac_pt_PKG_CONFIG=$PKG_CONFIG
 118 !   # Extract the first word of "pkg-config", so it can be a program name with args.
 119 ! set dummy pkg-config; ac_word=$2
 120 ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 121 ! $as_echo_n "checking for $ac_word... " >&6; }
 122 ! if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
 123 !   $as_echo_n "(cached) " >&6
 124 ! else
 125 !   case $ac_pt_PKG_CONFIG in
 126 !   [\\/]* | ?:[\\/]*)
 127 !   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
 128 !   ;;
 129 !   *)
 130 !   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 131 ! for as_dir in $PATH
 132 ! do
 133 !   IFS=$as_save_IFS
 134 !   test -z "$as_dir" && as_dir=.
 135 !     for ac_exec_ext in '' $ac_executable_extensions; do
 136 !   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 137 !     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 138 !     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 139 !     break 2
 140 !   fi
 141 ! done
 142 !   done
 143 ! IFS=$as_save_IFS
 144 !
 145 !   ;;
 146 ! esac
 147 ! fi
 148 ! ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 149 ! if test -n "$ac_pt_PKG_CONFIG"; then
 150 !   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 151 ! $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 152 ! else
 153 !   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 154 ! $as_echo "no" >&6; }
 155 ! fi
 156 !
 157 !   if test "x$ac_pt_PKG_CONFIG" = x; then
 158 !     PKG_CONFIG=""
 159 !   else
 160 !     case $cross_compiling:$ac_tool_warned in
 161 ! yes:)
 162 ! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 163 ! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 164 ! ac_tool_warned=yes ;;
 165 ! esac
 166 !     PKG_CONFIG=$ac_pt_PKG_CONFIG
 167 !   fi
 168 ! else
 169 !   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 170 ! fi
 171 !
 172 ! fi
 173 ! if test -n "$PKG_CONFIG"; then
 174 !       _pkg_min_version=0.9.0
 175 !       { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 176 ! $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 177 !       if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 178 !               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 179 ! $as_echo "yes" >&6; }
 180 !       else
 181 !               { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 182 ! $as_echo "no" >&6; }
 183 !               PKG_CONFIG=""
 184 !       fi
 185 !
 186 ! fi
 187 !
 188 ! pkg_failed=no
 189 ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5
 190 ! $as_echo_n "checking for ZZIP... " >&6; }
 191 !
 192 ! if test -n "$PKG_CONFIG"; then
 193 !     if test -n "$ZZIP_CFLAGS"; then
 194 !         pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS"
 195 !     else
 196 !         if test -n "$PKG_CONFIG" && \
 197 !     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
 198 !   ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
 199 !   ac_status=$?
 200 !   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 201 !   test $ac_status = 0; }; then
 202 !   pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null`
 203 ! else
 204 !   pkg_failed=yes
 205 ! fi
 206 !     fi
 207 ! else
 208 !       pkg_failed=untried
 209 ! fi
 210 ! if test -n "$PKG_CONFIG"; then
 211 !     if test -n "$ZZIP_LIBS"; then
 212 !         pkg_cv_ZZIP_LIBS="$ZZIP_LIBS"
 213 !     else
 214 !         if test -n "$PKG_CONFIG" && \
 215 !     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
 216 !   ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
 217 !   ac_status=$?
 218 !   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 219 !   test $ac_status = 0; }; then
 220 !   pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null`
 221 ! else
 222 !   pkg_failed=yes
 223 ! fi
 224 !     fi
 225 ! else
 226 !       pkg_failed=untried
 227 ! fi
 228 !
 229 !
 230 !
 231 ! if test $pkg_failed = yes; then
 232 !
 233 ! if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 234 !         _pkg_short_errors_supported=yes
 235 ! else
 236 !         _pkg_short_errors_supported=no
 237 ! fi
 238 !         if test $_pkg_short_errors_supported = yes; then
 239 !               ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
 240 !         else
 241 !               ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
 242 !         fi
 243 !       # Put the nasty error message in config.log where it belongs
 244 !       echo "$ZZIP_PKG_ERRORS" >&5
 245 !
 246 !       as_fn_error "Package requirements (zziplib >= 0.10.75) were not met:
 247 !
 248 ! $ZZIP_PKG_ERRORS
 249 !
 250 ! Consider adjusting the PKG_CONFIG_PATH environment variable if you
 251 ! installed software in a non-standard prefix.
 252 !
 253 ! Alternatively, you may set the environment variables ZZIP_CFLAGS
 254 ! and ZZIP_LIBS to avoid the need to call pkg-config.
 255 ! See the pkg-config man page for more details.
 256 ! " "$LINENO" 5
 257 ! elif test $pkg_failed = untried; then
 258 !       { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 259 ! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 260 ! as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 261 ! is in your PATH or set the PKG_CONFIG environment variable to the full
 262 ! path to pkg-config.
 263 !
 264 ! Alternatively, you may set the environment variables ZZIP_CFLAGS
 265 ! and ZZIP_LIBS to avoid the need to call pkg-config.
 266 ! See the pkg-config man page for more details.
 267 !
 268 ! To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 269 ! See \`config.log' for more details." "$LINENO" 5; }
 270 ! else
 271 !       ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS
 272 !       ZZIP_LIBS=$pkg_cv_ZZIP_LIBS
 273 !         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 274 ! $as_echo "yes" >&6; }
 275 !       :
 276 ! fi
 277
 278   SDL_VERSION=1.2.0
 279
 280 --- 5304,5310 ----
 281   fi
 282
 283   #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
 284 ! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
 285
 286   SDL_VERSION=1.2.0
 287