diff -Nru aaphoto-0.43.1/aaio.c aaphoto-0.45/aaio.c --- aaphoto-0.43.1/aaio.c 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/aaio.c 2016-07-09 19:02:20.000000000 +0000 @@ -370,7 +370,6 @@ char fname [max_char]; char fext [max_char]; char fextj1 [] = ".jpg\0"; - char fextj2 [] = ".jp2\0"; char fextj3 [] = ".png\0"; char fextj4 [] = ".bmp\0"; char fnew [] = "_new"; @@ -426,9 +425,8 @@ while (fext[i] != '\0') { if (c >= max_char) return 255; - if ((!opt_jpg) && (!opt_jp2) && (!opt_png) && (!opt_bmp)) strout[c] = fext[i]; + if ((!opt_jpg) && (!opt_png) && (!opt_bmp)) strout[c] = fext[i]; if (opt_jpg) strout[c] = fextj1[i]; - if (opt_jp2) strout[c] = fextj2[i]; if (opt_png) strout[c] = fextj3[i]; if (opt_bmp) strout[c] = fextj4[i]; i++; c++; @@ -436,8 +434,7 @@ if (c >= max_char) return 255; strout[c] = fext[i]; - if (opt_jpg) bitmap_format_jpg_file_type = 6; - if (opt_jp2) bitmap_format_jpg_file_type = 4; + if (opt_jpg) bitmap_format_jpg_file_type = 1; if (!(opt_overwrite) && (FILE_EXIST(strout))) return 1; @@ -457,17 +454,11 @@ char fext[max_char]; char fextl[max_char]; - /* JasPer format codes (0-7) */ + /* format codes */ /* --------------------------- */ - /* 0 - mif */ - /* 1 - pnm / pgm / ppm */ - /* 2 - bmp */ - /* 3 - ras */ - /* 4 - jp2 */ - /* 5 - jpc */ - /* 6 - jpg */ - /* 7 - pgx */ - /* 8 - png */ + /* 0 - bmp */ + /* 1 - jpg */ + /* 2 - png */ GET_FILE_EXTENSION(file_name, fext); @@ -475,19 +466,11 @@ res = -1; - if (!STRING_COMPARE(fextl, ".mif")) res = 0; - if (!STRING_COMPARE(fextl, ".pnm")) res = 1; - if (!STRING_COMPARE(fextl, ".pgm")) res = 1; - if (!STRING_COMPARE(fextl, ".ppm")) res = 1; - if (!STRING_COMPARE(fextl, ".bmp")) res = 2; - if (!STRING_COMPARE(fextl, ".ras")) res = 3; - if (!STRING_COMPARE(fextl, ".jp2")) res = 4; - if (!STRING_COMPARE(fextl, ".jpc")) res = 5; - if (!STRING_COMPARE(fextl, ".jpg")) res = 6; - if (!STRING_COMPARE(fextl, ".jpeg")) res = 6; - if (!STRING_COMPARE(fextl, ".jpe")) res = 6; -/* if (!STRING_COMPARE(fextl, ".pgx")) res = 7; */ - if (!STRING_COMPARE(fextl, ".png")) res = 8; + if (!STRING_COMPARE(fextl, ".bmp")) res = 0; + if (!STRING_COMPARE(fextl, ".jpg")) res = 1; + if (!STRING_COMPARE(fextl, ".jpeg")) res = 1; + if (!STRING_COMPARE(fextl, ".jpe")) res = 1; + if (!STRING_COMPARE(fextl, ".png")) res = 2; return res; } @@ -1226,231 +1209,6 @@ #ifndef __BMP_ONLY__ -/* -------------------------------------------------- */ -/* --------- BITMAP READ IN JASPER FORMAT ----------- */ -/* -------------------------------------------------- */ -int BITMAP_READ_JASPER(char *file_name) -{ - int i, j, channel; - int num_of_channels; - int dx, dy, clr_spc; - int clrspc_type; - - jas_stream_t *stream; - jas_image_t *image; - jas_matrix_t *data; - - /* initialize jasper library */ - /* print info */ STRING_PRINTV("jasper initializations\n"); - jas_init(); - - /* load file and decode format */ - /* print info */ STRING_PRINTV("opening file for reading\n"); - stream = jas_stream_fopen(file_name, "rb"); - if (stream == NULL) return 1; - - /* store bitmap format */ - bitmap_format_jpg_file_type = jas_image_getfmt(stream); - - /* print info */ STRING_PRINTV("decoding jasper image\n"); - image = jas_image_decode(stream, -1, NULL); - jas_stream_close(stream); - if (image == NULL) return 1; - bitmap_width = jas_image_width(image); - bitmap_height = jas_image_height(image); - clrspc_type = jas_image_clrspc(image); - - if (clrspc_type == JAS_CLRSPC_SGRAY) { bitmap_format_jpg_clrspc_type = 8; } - if (clrspc_type == JAS_CLRSPC_SRGB) { bitmap_format_jpg_clrspc_type = 24; } - - if (bitmap_format_jpg_clrspc_type == 8) { bitmap_format_png_clrspc_type = 0; } - if (bitmap_format_jpg_clrspc_type == 24) { bitmap_format_png_clrspc_type = 2; } - if (bitmap_format_jpg_clrspc_type == 8) { bitmap_format_bmp_clrspc_type = 8; } - if (bitmap_format_jpg_clrspc_type == 24) { bitmap_format_bmp_clrspc_type = 24; } - - /* allocate memory */ - /* print info */ STRING_PRINTV("allocating memory for uncompressed bitmap image\n"); - bitmap_buffer = malloc(bitmap_width * bitmap_height * 3 * sizeof(*bitmap_buffer)); - if (bitmap_buffer == 0) return 1; - - /* print info */ STRING_PRINTV("dimension is "); STRING_PRINTVD(bitmap_width); - /* print info */ STRING_PRINTV2(" x "); STRING_PRINTVD(bitmap_height); STRING_PRINTV2(" pixels\n"); - /* print info */ STRING_PRINTV("colors have "); STRING_PRINTVD(bitmap_format_jpg_clrspc_type); - /* print info */ STRING_PRINTV2(" bit depth\n"); - - /* check file whether it conatins 24-bit RGB or 8-bit colors */ - clr_spc = jas_clrspc_fam(clrspc_type); - if ((clr_spc != JAS_CLRSPC_FAM_RGB) && (clr_spc != JAS_CLRSPC_FAM_GRAY)) return 1; - if (jas_image_cmptprec(image, 0) != 8) return 1; - - /* create jasper matrix */ - dx = bitmap_width; - dy = bitmap_height; - data = jas_matrix_create(dy,dx); - - /* read datas out of jasper object and copy it to a memory block */ - - /* determine number of channels: GRAY = 1, RGB = 3 */ - num_of_channels = 1; - if (clr_spc == JAS_CLRSPC_FAM_GRAY) { num_of_channels = 1; } - if (clr_spc == JAS_CLRSPC_FAM_RGB) { num_of_channels = 3; } - - /* copy RGB colors to bitmap memory */ - /* print info */ STRING_PRINTV("copying colors from jasper object to bitmap buffer\n"); - for (channel=0; channel 7)) return 1; */ - fmt = bitmap_format_jpg_file_type; - - /* set quality value */ - if (opt_quality < 0) { opt_quality = 0; } - if (opt_quality > 100){ opt_quality = 100; } - if (!(opt_quality)){ - if (fmt == 4) opt = "rate=0.95"; - if (fmt == 5) opt = "rate=0.95"; - if (fmt == 6) opt = "quality=95"; - } - else{ - if ((fmt == 4) || (fmt == 5)){ - opt = "rate=1.00\0"; - for (i=0; opt[i]!='\0'; i++){ opt2[i] = opt[i]; } opt2[i] = opt[i]; - if (opt_quality < 100){ - opt2[5] = '0'; - opt2[7] = '0' + (opt_quality / 10); - opt2[8] = '0' + (opt_quality % 10); - } - opt = opt2; - } - if (fmt == 6){ - opt = "quality=100\0"; - for (i=0; opt[i]!='\0'; i++){ opt2[i] = opt[i]; } opt2[i] = opt[i]; - if (opt_quality < 100){ - opt2[10] = '\0'; - opt2[8] = '0' + (opt_quality / 10); - opt2[9] = '0' + (opt_quality % 10); - } - opt = opt2; - } - } - - /* open file for writing and encode format */ - /* print info */ STRING_PRINTV("opening file for writing\n"); - stream = jas_stream_fopen(file_name,"w+b"); - - /* print info */ STRING_PRINTV("encoding jasper image\n"); - jas_image_encode(image, stream, fmt, opt); - - /* write file */ - /* print info */ STRING_PRINTV("writing image file\n"); - jas_stream_flush(stream); - jas_stream_close(stream); - - /* free previously allocated objects */ - /* print info */ STRING_PRINTV("freeing jasper object\n"); - jas_image_destroy(image); - jas_matrix_destroy(data); - jas_image_clearfmts(); -/* jas_cleanup(); */ - - return 0; -} - - - - /* ----------------------------------------------- */ /* --------- BITMAP READ IN PNG FORMAT ----------- */ /* ----------------------------------------------- */ @@ -1851,7 +1609,8 @@ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); /* set image resolution */ - png_set_pHYs(png_ptr, info_ptr, xdpi, ydpi, udpi); + /* png_set_pHYs(png_ptr, info_ptr, xdpi, ydpi, udpi); */ + png_set_pHYs(png_ptr, info_ptr, xdpi, ydpi, PNG_RESOLUTION_METER); png_write_info(png_ptr, info_ptr); @@ -2126,8 +1885,8 @@ fclose(fhandle); /* print info */ STRING_PRINTV("file exists\n"); - /* if it's a BMP format, then load BMP with custom procedure (and not jasper) */ - if (GET_FILE_FORMAT(file_name) == 2){ + /* if it's a BMP format, then load BMP with custom procedure */ + if (GET_FILE_FORMAT(file_name) == 0){ if (BITMAP_READ_BMP(file_name)) return 1; } else{ @@ -2139,22 +1898,18 @@ #ifndef __BMP_ONLY__ - /* if it's a PNG format, then load that one */ - if (GET_FILE_FORMAT(file_name) == 8){ - if (BITMAP_READ_PNG(file_name)) return 1; + /* if it's a JPEG, then save exif info and load image with libjpeg */ + if (GET_FILE_FORMAT(file_name) == 1){ + if (BITMAP_READ_JPEG(file_name)) return 1; return 0; } - /* if it's a JPEG, then save exif info and load image with libjpeg (and not libjasper) */ - if (GET_FILE_FORMAT(file_name) == 6){ - if (BITMAP_READ_JPEG(file_name)) return 1; + /* if it's a PNG format, then load that one */ + if (GET_FILE_FORMAT(file_name) == 2){ + if (BITMAP_READ_PNG(file_name)) return 1; return 0; } - /* in every other case, load jasper format */ - /* because anyway there are no other supported formats */ - /* and jasper will signal if it's not one of its supported ones */ - if (BITMAP_READ_JASPER(file_name)) return 1; return 0; @@ -2174,10 +1929,10 @@ int BITMAP_SAVE(char *file_name) { /* if the format is not JPEG, then clear exif info (memory is freed) */ - if (GET_FILE_FORMAT(file_name) != 6){ EXIF_CLEAR(); } + if (GET_FILE_FORMAT(file_name) != 1){ EXIF_CLEAR(); } - /* if it's a BMP format, then save BMP with custom procedure (and not with jasper) */ - if (GET_FILE_FORMAT(file_name) == 2){ + /* if it's a BMP format, then save BMP with custom procedure */ + if (GET_FILE_FORMAT(file_name) == 0){ if (BITMAP_WRITE_BMP(file_name)) { free(bitmap_buffer); return 1; } /* free memory on success */ @@ -2196,10 +1951,10 @@ #ifndef __BMP_ONLY__ - /* if it's a PNG, then save PNG */ - if (GET_FILE_FORMAT(file_name) == 8){ - if (BITMAP_WRITE_PNG(file_name)) { - /* print info */ STRING_PRINTV("freeing uncompressed bitmap buffer\n"); + /* if it's a JPEG, then save it */ + if (GET_FILE_FORMAT(file_name) == 1){ + if (BITMAP_WRITE_JPEG(file_name)) { + /* print info */ STRING_PRINTV("freeing uncompressed bitmap buffer\n"); free(bitmap_buffer); return 1; } /* free memory on success */ @@ -2208,10 +1963,10 @@ return 0; } - /* if it's a JPEG, then save it */ - if (GET_FILE_FORMAT(file_name) == 6){ - if (BITMAP_WRITE_JPEG(file_name)) { - /* print info */ STRING_PRINTV("freeing uncompressed bitmap buffer\n"); + /* if it's a PNG, then save PNG */ + if (GET_FILE_FORMAT(file_name) == 2){ + if (BITMAP_WRITE_PNG(file_name)) { + /* print info */ STRING_PRINTV("freeing uncompressed bitmap buffer\n"); free(bitmap_buffer); return 1; } /* free memory on success */ @@ -2221,13 +1976,6 @@ } - /* in every other case, save jasper format */ - /* because anyway there are no other supported formats */ - /* and jasper will signal if it's not one of its supported ones */ - if (BITMAP_WRITE_JASPER(file_name)) { - /* print info */ STRING_PRINTV("freeing uncompressed bitmap buffer\n"); - free(bitmap_buffer); return 1; } - /* free memory on success */ /* print info */ STRING_PRINTV("freeing uncompressed bitmap buffer\n"); free(bitmap_buffer); diff -Nru aaphoto-0.43.1/aaphoto.c aaphoto-0.45/aaphoto.c --- aaphoto-0.43.1/aaphoto.c 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/aaphoto.c 2016-07-09 19:02:20.000000000 +0000 @@ -23,13 +23,16 @@ /* --------------------------------------------------- */ /* ----------- Auto Adjust Photo --------------------- */ -/* ----------- András Horváth (C) 2006-2013 ---------- */ +/* ----------- András Horváth (C) 2006-2016 ---------- */ /* ----------- Hungary, http://log69.com ------------- */ /* --------------------------------------------------- */ /* aaphoto Changelog: -------------------- +2016/07/09 - aaphoto v0.45 - fix libpng error: unrecognized unit type for pHYs chunk +2016/07/02 - aaphoto v0.44 - remove libjasper dependency because it gets removed from Debian 9 + and anyway it supported file formats that nobody used 2013/09/30 - aaphoto v0.43 - new aaRGB v0.65 version update (see aaRGB changelog) 2012/02/20 - aaphoto v0.42 - tiny fix to set PNG compression manually and make it compatible with new version of libpng 2011/01/26 - aaphoto v0.41 - new aaRGB v0.64 version update (see aaRGB changelog) @@ -201,7 +204,6 @@ int opt_autoadjust; int opt_overwrite; int opt_jpg; -int opt_jp2; int opt_png; int opt_bmp; int opt_resize; @@ -243,7 +245,6 @@ #ifndef __BMP_ONLY__ -#include #include #include #endif @@ -264,19 +265,18 @@ void PRINT_VERSION(void){ STRING_PRINT("Auto Adjust Photo\n"); -STRING_PRINT("Copyright (C) 2006-2013 Andras Horvath\n"); +STRING_PRINT("Copyright (C) 2006-2016 Andras Horvath\n"); STRING_PRINT("E-mail: mail@log69.com - suggestions & feedbacks are welcome\n"); -STRING_PRINT("URL: http://log69.com - the official site\n"); -STRING_PRINT("aaphoto (command-line) version - v0.43\n"); +STRING_PRINT("URL: http://log69.com/aaphoto_en.html - the official site\n"); +STRING_PRINT("aaphoto (command-line) version - v0.45\n"); STRING_PRINT("aaRGB (color-correction engine) version - v0.65\n"); -STRING_PRINT("last update = 26/09/2013\n"); +STRING_PRINT("last update = 09/07/2016\n"); STRING_PRINT("\n"); #ifndef __BMP_ONLY__ STRING_PRINT("The following libraries are used by this program:\n"); #ifdef __OPENMP__ STRING_PRINT("libgomp - OpenMP for parallel programming, http://gcc.gnu.org/onlinedocs/libgomp/\n"); #endif -STRING_PRINT("libjasper - JasPer software, http://www.ece.uvic.ca/~mdadams/jasper/\n"); STRING_PRINT("libjpeg - IJG JPEG software, http://www.ijg.org/\n"); STRING_PRINT("libpng - PNG software, http://www.libpng.org/\n"); STRING_PRINT("libz - Compression library, http://www.zlib.net/\n"); @@ -329,10 +329,10 @@ STRING_PRINT("[HELP]\n"); STRING_PRINT("USAGE: aaphoto [options] [source files]\n"); STRING_PRINT("\n"); -STRING_PRINT("The following image types are supported (thanks to JasPer, JPEG and PNG):\n"); -STRING_PRINT("mif, pnm / pgm / ppm, bmp, ras, jp2, jpc, jpg, png\n"); +STRING_PRINT("The following image types are supported (thanks to JPEG and PNG):\n"); +STRING_PRINT("bmp, jpg, png\n"); STRING_PRINT("\n"); -STRING_PRINT("Quality settings can be applied only to jp2, jpc, jpg formats\n"); +STRING_PRINT("Quality settings can be applied only to jpg format\n"); STRING_PRINT("\n"); STRING_PRINT("The following options are supported:\n"); STRING_PRINT(" -h --help Print this help\n"); @@ -341,7 +341,6 @@ STRING_PRINT(" -o --output Set output directory\n"); STRING_PRINT(" --overwrite Overwrite mode, the original source file is replaced\n"); STRING_PRINT(" --jpg JPEG image output\n"); -STRING_PRINT(" --jp2 JPEG 2000 image output\n"); STRING_PRINT(" --png PNG image output with alpha channel support\n"); STRING_PRINT(" --bmp BMP image output\n"); STRING_PRINT(" -r --resize Resize image taking the longer side in % or pixels\n"); @@ -364,7 +363,7 @@ STRING_PRINT(" aaphoto -a -r600 -q85 *.jpg\n"); STRING_PRINT(" aaphoto mydir\n"); STRING_PRINT(" aaphoto -V --resize70% image.png\n"); -STRING_PRINT(" aaphoto --quality60 image.jp2\n"); +STRING_PRINT(" aaphoto --quality60 image.jpg\n"); STRING_PRINT("\n"); STRING_PRINT("REMARKS:\n"); STRING_PRINT("- auto adjust parameter is set by default without any other parameters\n"); @@ -558,7 +557,6 @@ opt_overwrite = 0; opt_noexif = 0; opt_jpg = 0; - opt_jp2 = 0; opt_png = 0; opt_bmp = 0; opt_resize = 0; @@ -617,8 +615,6 @@ opt_wrong = 0; opt_noexif = 1; } if (!STRING_COMPARE(myarg, "--jpg\0")){ opt_wrong = 0; opt_jpg = 1; } - if (!STRING_COMPARE(myarg, "--jp2\0")){ - opt_wrong = 0; opt_jp2 = 1; } if (!STRING_COMPARE(myarg, "--png\0")){ opt_wrong = 0; opt_png = 1; } if (!STRING_COMPARE(myarg, "--bmp\0")){ @@ -951,7 +947,6 @@ /* check if only 1 type of output format is specified on input */ int cnt = 0; if (opt_jpg) cnt++; - if (opt_jp2) cnt++; if (opt_png) cnt++; if (opt_bmp) cnt++; if (cnt > 1){ @@ -970,7 +965,6 @@ cnt += opt_output; cnt += opt_overwrite; cnt += opt_jpg; - cnt += opt_jp2; cnt += opt_png; cnt += opt_bmp; cnt += opt_resize; @@ -1001,7 +995,6 @@ (opt_overwrite ) || (opt_noexif ) || (opt_jpg ) || - (opt_jp2 ) || (opt_png ) || (opt_bmp ) || (opt_resize ) || diff -Nru aaphoto-0.43.1/aargb.c aaphoto-0.45/aargb.c --- aaphoto-0.43.1/aargb.c 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/aargb.c 2016-07-09 19:02:20.000000000 +0000 @@ -21,7 +21,7 @@ /* --------------------------------------------------- */ /* ----------- Auto Adjust RGB ----------------------- */ -/* ----------- András Horváth (C) 2006-2013 ---------- */ +/* ----------- András Horváth (C) 2006-2016 ---------- */ /* ----------- Hungary, http://log69.com ------------- */ /* --------------------------------------------------- */ diff -Nru aaphoto-0.43.1/ChangeLog aaphoto-0.45/ChangeLog --- aaphoto-0.43.1/ChangeLog 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/ChangeLog 2016-07-09 19:02:20.000000000 +0000 @@ -1,5 +1,8 @@ aaphoto Changelog: -------------------- +2016/07/09 - aaphoto v0.45 - fix libpng error: unrecognized unit type for pHYs chunk +2016/07/02 - aaphoto v0.44 - remove libjasper dependency because it gets removed from Debian 9 + and anyway it supported file formats that nobody used 2013/09/30 - aaphoto v0.43 - new aaRGB v0.65 version update (see aaRGB changelog) 2012/02/20 - aaphoto v0.42 - tiny fix to set PNG compression manually and make it compatible with new version of libpng 2011/01/26 - aaphoto v0.41 - new aaRGB v0.64 version update (see aaRGB changelog) diff -Nru aaphoto-0.43.1/config.h.in aaphoto-0.45/config.h.in --- aaphoto-0.43.1/config.h.in 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/config.h.in 2016-07-09 19:02:20.000000000 +0000 @@ -6,9 +6,6 @@ /* Define to 1 if you have the `gomp' library (-lgomp). */ #undef HAVE_LIBGOMP -/* Define to 1 if you have the `jasper' library (-ljasper). */ -#undef HAVE_LIBJASPER - /* Define to 1 if you have the `jpeg' library (-ljpeg). */ #undef HAVE_LIBJPEG diff -Nru aaphoto-0.43.1/configure aaphoto-0.45/configure --- aaphoto-0.43.1/configure 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/configure 2016-07-09 19:02:20.000000000 +0000 @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for aaphoto 0.41. +# Generated by GNU Autoconf 2.69 for aaphoto 0.45. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -168,7 +192,8 @@ else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -213,14 +238,25 @@ if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -323,6 +359,14 @@ } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -444,6 +488,10 @@ chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -478,16 +526,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -499,28 +547,8 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -552,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='aaphoto' PACKAGE_TARNAME='aaphoto' -PACKAGE_VERSION='0.41' -PACKAGE_STRING='aaphoto 0.41' +PACKAGE_VERSION='0.45' +PACKAGE_STRING='aaphoto 0.45' PACKAGE_BUGREPORT='mail@log69.com' PACKAGE_URL='' @@ -659,6 +687,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -730,6 +759,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -982,6 +1012,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1096,7 +1135,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1119,7 +1158,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1147,8 +1186,6 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1234,7 +1271,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures aaphoto 0.41 to adapt to many kinds of systems. +\`configure' configures aaphoto 0.45 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1274,6 +1311,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1300,7 +1338,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of aaphoto 0.41:";; + short | recursive ) echo "Configuration of aaphoto 0.45:";; esac cat <<\_ACEOF @@ -1387,10 +1425,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -aaphoto configure 0.41 -generated by GNU Autoconf 2.67 +aaphoto configure 0.45 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1434,7 +1472,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1466,7 +1504,7 @@ test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1480,7 +1518,7 @@ # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1517,7 +1555,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1530,10 +1568,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1600,7 +1638,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1609,7 +1647,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1650,7 +1688,7 @@ ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1664,7 +1702,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1682,7 +1720,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1694,7 +1732,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1749,15 +1787,15 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by aaphoto $as_me 0.41, which was -generated by GNU Autoconf 2.67. Invocation command line was +It was created by aaphoto $as_me 0.45, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2015,7 +2053,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2152,7 +2190,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2172,7 +2210,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2239,11 +2277,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2329,7 +2367,7 @@ set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2341,7 +2379,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2369,7 +2407,7 @@ set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2381,7 +2419,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2422,7 +2460,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2432,7 +2470,7 @@ test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2473,7 +2511,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2485,7 +2523,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2513,7 +2551,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2571,7 +2609,7 @@ # Define the identity of the package. PACKAGE=aaphoto - VERSION=0.41 + VERSION=0.45 cat >>confdefs.h <<_ACEOF @@ -2630,7 +2668,7 @@ set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2642,7 +2680,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2670,7 +2708,7 @@ set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2682,7 +2720,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2723,7 +2761,7 @@ set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2735,7 +2773,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2763,7 +2801,7 @@ set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2776,7 +2814,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2822,7 +2860,7 @@ set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2834,7 +2872,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2866,7 +2904,7 @@ set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2878,7 +2916,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2921,7 +2959,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3036,7 +3074,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3079,7 +3117,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3138,7 +3176,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3149,7 +3187,7 @@ ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3190,7 +3228,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -3200,7 +3238,7 @@ ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3237,7 +3275,7 @@ ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3315,7 +3353,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3324,8 +3362,7 @@ /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3476,7 +3513,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3605,7 +3642,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgomp" >&5 $as_echo_n "checking for main in -lgomp... " >&6; } -if test "${ac_cv_lib_gomp_main+set}" = set; then : +if ${ac_cv_lib_gomp_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3633,7 +3670,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gomp_main" >&5 $as_echo "$ac_cv_lib_gomp_main" >&6; } -if test "x$ac_cv_lib_gomp_main" = x""yes; then : +if test "x$ac_cv_lib_gomp_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBGOMP 1 _ACEOF @@ -3642,50 +3679,10 @@ fi -# FIXME: Replace `main' with a function in `-ljasper': -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljasper" >&5 -$as_echo_n "checking for main in -ljasper... " >&6; } -if test "${ac_cv_lib_jasper_main+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljasper $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_jasper_main=yes -else - ac_cv_lib_jasper_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jasper_main" >&5 -$as_echo "$ac_cv_lib_jasper_main" >&6; } -if test "x$ac_cv_lib_jasper_main" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBJASPER 1 -_ACEOF - - LIBS="-ljasper $LIBS" - -fi - # FIXME: Replace `main' with a function in `-ljpeg': { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 $as_echo_n "checking for main in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_main+set}" = set; then : +if ${ac_cv_lib_jpeg_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3713,7 +3710,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 $as_echo "$ac_cv_lib_jpeg_main" >&6; } -if test "x$ac_cv_lib_jpeg_main" = x""yes; then : +if test "x$ac_cv_lib_jpeg_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBJPEG 1 _ACEOF @@ -3725,7 +3722,7 @@ # FIXME: Replace `main' with a function in `-lm': { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lm" >&5 $as_echo_n "checking for main in -lm... " >&6; } -if test "${ac_cv_lib_m_main+set}" = set; then : +if ${ac_cv_lib_m_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3753,7 +3750,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_main" >&5 $as_echo "$ac_cv_lib_m_main" >&6; } -if test "x$ac_cv_lib_m_main" = x""yes; then : +if test "x$ac_cv_lib_m_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF @@ -3765,7 +3762,7 @@ # FIXME: Replace `main' with a function in `-lpng': { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpng" >&5 $as_echo_n "checking for main in -lpng... " >&6; } -if test "${ac_cv_lib_png_main+set}" = set; then : +if ${ac_cv_lib_png_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3793,7 +3790,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_main" >&5 $as_echo "$ac_cv_lib_png_main" >&6; } -if test "x$ac_cv_lib_png_main" = x""yes; then : +if test "x$ac_cv_lib_png_main" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBPNG 1 _ACEOF @@ -3816,7 +3813,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3932,7 +3929,7 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3944,7 +3941,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3958,7 +3955,7 @@ for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4007,7 +4004,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4024,7 +4021,7 @@ for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4074,7 +4071,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4204,7 +4201,7 @@ for ac_header in stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDLIB_H 1 _ACEOF @@ -4220,7 +4217,7 @@ for ac_header in stdlib.h do : ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -if test "x$ac_cv_header_stdlib_h" = x""yes; then : +if test "x$ac_cv_header_stdlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STDLIB_H 1 _ACEOF @@ -4231,7 +4228,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 $as_echo_n "checking for GNU libc compatible malloc... " >&6; } -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then : +if ${ac_cv_func_malloc_0_nonnull+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -4363,10 +4360,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -4414,7 +4422,7 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -4515,6 +4523,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -4710,16 +4719,16 @@ # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -4779,28 +4788,16 @@ as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4821,8 +4818,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by aaphoto $as_me 0.41, which was -generated by GNU Autoconf 2.67. Invocation command line was +This file was extended by aaphoto $as_me 0.45, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4887,11 +4884,11 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -aaphoto config.status 0.41 -configured by $0, generated by GNU Autoconf 2.67, +aaphoto config.status 0.45 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4982,7 +4979,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -5020,7 +5017,7 @@ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -5043,9 +5040,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -5053,12 +5051,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -5080,7 +5079,7 @@ ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -5108,7 +5107,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -5156,7 +5155,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -5188,7 +5187,7 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -5222,7 +5221,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -5234,8 +5233,8 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -5336,7 +5335,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -5355,7 +5354,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -5364,7 +5363,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -5390,8 +5389,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -5527,21 +5526,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -5552,20 +5552,20 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. diff -Nru aaphoto-0.43.1/configure.ac aaphoto-0.45/configure.ac --- aaphoto-0.43.1/configure.ac 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/configure.ac 2016-07-09 19:02:20.000000000 +0000 @@ -1,5 +1,5 @@ -AC_INIT([aaphoto], [0.42], [mail@log69.com]) -AM_INIT_AUTOMAKE([aaphoto], [0.42]) +AC_INIT([aaphoto], [0.45], [mail@log69.com]) +AM_INIT_AUTOMAKE # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. @@ -13,8 +13,6 @@ # Checks for libraries. # FIXME: Replace `main' with a function in `-lgomp': AC_CHECK_LIB([gomp], [main]) -# FIXME: Replace `main' with a function in `-ljasper': -AC_CHECK_LIB([jasper], [main]) # FIXME: Replace `main' with a function in `-ljpeg': AC_CHECK_LIB([jpeg], [main]) # FIXME: Replace `main' with a function in `-lm': diff -Nru aaphoto-0.43.1/COPYRIGHT aaphoto-0.45/COPYRIGHT --- aaphoto-0.43.1/COPYRIGHT 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/COPYRIGHT 2016-07-09 19:02:20.000000000 +0000 @@ -1,7 +1,7 @@ Auto Adjust Photo (aaphoto) Auto Adjust RGB (aaRGB) -Copyright (C) 2006-2013 Andras Horvath +Copyright (C) Andras Horvath http://log69.com, mail@log69.com All rights reserved. diff -Nru aaphoto-0.43.1/debian/aaphoto.1 aaphoto-0.45/debian/aaphoto.1 --- aaphoto-0.43.1/debian/aaphoto.1 2015-02-06 22:26:12.000000000 +0000 +++ aaphoto-0.45/debian/aaphoto.1 2016-07-09 16:51:04.000000000 +0000 @@ -5,7 +5,7 @@ .SH NAME aaphoto - automatic color correction of photos -.SH SYNOPSYS +.SH SYNOPSIS aaphoto [option[s]] [source file[s]] .SH DESCRIPTION diff -Nru aaphoto-0.43.1/debian/changelog aaphoto-0.45/debian/changelog --- aaphoto-0.43.1/debian/changelog 2016-04-22 23:56:48.000000000 +0000 +++ aaphoto-0.45/debian/changelog 2016-07-10 12:06:33.000000000 +0000 @@ -1,8 +1,16 @@ -aaphoto (0.43.1-4build1) yakkety; urgency=medium +aaphoto (0.45-1) unstable; urgency=low - * No-change rebuild for libpng soname change. + * New upstream release (Closes: #818193). + * Remove libjasper-dev build dependency. + * Remove merged patches: + + 01_fix-Makefile.patch + + 02_modernize-configure.patch + * Simplify and update debian/copyright file. + * Fix spelling error in manpage. + * Fix a segmentation fault with libpng 1.6 + * Bump standards version to 3.9.8 - -- Matthias Klose Fri, 22 Apr 2016 23:56:48 +0000 + -- Denis Briand Sun, 10 Jul 2016 13:38:19 +0200 aaphoto (0.43.1-4) unstable; urgency=low diff -Nru aaphoto-0.43.1/debian/control aaphoto-0.45/debian/control --- aaphoto-0.43.1/debian/control 2015-02-12 13:57:33.000000000 +0000 +++ aaphoto-0.45/debian/control 2016-07-10 12:06:47.000000000 +0000 @@ -5,10 +5,9 @@ Build-Depends: debhelper (>= 9), dh-autoreconf, autotools-dev, - libjasper-dev, libjpeg-dev, libpng-dev -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://log69.com/aaphoto_en.html Package: aaphoto diff -Nru aaphoto-0.43.1/debian/copyright aaphoto-0.45/debian/copyright --- aaphoto-0.43.1/debian/copyright 2015-02-19 15:42:53.000000000 +0000 +++ aaphoto-0.45/debian/copyright 2016-07-09 16:51:16.000000000 +0000 @@ -6,28 +6,15 @@ Files: * Copyright: 2006-2015 Andras Horvath License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". Files: debian/* Copyright: 2010-2011 Andras Horvath 2012 Julien Cristau 2014 IOhannes m zmölnig 2015 Joao Eriberto Mota Filho - 2015 Denis Briand + 2015-2016 Denis Briand +License: GPL-3.0+ + License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru aaphoto-0.43.1/debian/patches/01_fix-Makefile.patch aaphoto-0.45/debian/patches/01_fix-Makefile.patch --- aaphoto-0.43.1/debian/patches/01_fix-Makefile.patch 2015-01-30 00:31:21.000000000 +0000 +++ aaphoto-0.45/debian/patches/01_fix-Makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Description: fix the Makefile.am. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-01-29 -Index: aaphoto-0.43.1/Makefile.am -=================================================================== ---- aaphoto-0.43.1.orig/Makefile.am -+++ aaphoto-0.43.1/Makefile.am -@@ -2,4 +2,3 @@ AM_CFLAGS = -Wall -O2 -D__OPENMP__ -fope - AM_LDFLAGS = -ljasper -ljpeg -lpng -lm -lgomp - bin_PROGRAMS = aaphoto - aaphoto_SOURCES = aaphoto.c --INCLUDES = diff -Nru aaphoto-0.43.1/debian/patches/02_modernize-configure.patch aaphoto-0.45/debian/patches/02_modernize-configure.patch --- aaphoto-0.43.1/debian/patches/02_modernize-configure.patch 2015-01-30 00:25:05.000000000 +0000 +++ aaphoto-0.45/debian/patches/02_modernize-configure.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: modernize configure.ac as described at http://www.gnu.org/ \ - software/automake/manual/automake.html \ - #Modernize-AM_005fINIT_005fAUTOMAKE-invocation -Author: Joao Eriberto Mota Filho -Last-Update: 2015-01-29 -Index: aaphoto-0.43.1/configure.ac -=================================================================== ---- aaphoto-0.43.1.orig/configure.ac -+++ aaphoto-0.43.1/configure.ac -@@ -1,5 +1,5 @@ - AC_INIT([aaphoto], [0.42], [mail@log69.com]) --AM_INIT_AUTOMAKE([aaphoto], [0.42]) -+AM_INIT_AUTOMAKE - # -*- Autoconf -*- - # Process this file with autoconf to produce a configure script. - diff -Nru aaphoto-0.43.1/debian/patches/series aaphoto-0.45/debian/patches/series --- aaphoto-0.43.1/debian/patches/series 2015-02-06 22:27:46.000000000 +0000 +++ aaphoto-0.45/debian/patches/series 2016-07-10 11:32:25.000000000 +0000 @@ -1,2 +1,2 @@ -01_fix-Makefile.patch -02_modernize-configure.patch +#Fix a segmentation fault with libpng 1.6 +SIGSEGV_with_libpng1.6.diff diff -Nru aaphoto-0.43.1/debian/patches/SIGSEGV_with_libpng1.6.diff aaphoto-0.45/debian/patches/SIGSEGV_with_libpng1.6.diff --- aaphoto-0.43.1/debian/patches/SIGSEGV_with_libpng1.6.diff 1970-01-01 00:00:00.000000000 +0000 +++ aaphoto-0.45/debian/patches/SIGSEGV_with_libpng1.6.diff 2016-07-10 11:31:53.000000000 +0000 @@ -0,0 +1,13 @@ +Author: Andras Horvath +Description: Fix a segmentation fault with libpng 1.6 +============================================================ +--- a/aaio.c ++++ b/aaio.c +@@ -1617,7 +1617,6 @@ int BITMAP_WRITE_PNG(char *file_name) + /* png_set_packing(png_ptr); */ + + +- png_read_update_info(png_ptr, info_ptr); + rowbytes = png_get_rowbytes(png_ptr, info_ptr); + + row_pointers = malloc(bitmap_height * sizeof (long)); diff -Nru aaphoto-0.43.1/debian/rules aaphoto-0.45/debian/rules --- aaphoto-0.43.1/debian/rules 2015-02-06 22:27:12.000000000 +0000 +++ aaphoto-0.45/debian/rules 2016-07-09 22:49:05.000000000 +0000 @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export DEB_CFLAGS_MAINT_APPEND = -g + export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: diff -Nru aaphoto-0.43.1/INSTALL aaphoto-0.45/INSTALL --- aaphoto-0.43.1/INSTALL 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/INSTALL 2016-07-09 19:02:20.000000000 +0000 @@ -3,7 +3,6 @@ GCC - Gnu Compiler Collection, http://gcc.gnu.org/ libgomp - OpenMP for parallel programming, http://gcc.gnu.org/onlinedocs/libgomp/ -libjasper - JasPer software, http://www.ece.uvic.ca/~mdadams/jasper/ libjpeg - IJG Jpeg software, http://www.ijg.org/ libpng - PNG software, http://www.libpng.org/ libz - Compression library, http://www.zlib.net/ @@ -14,8 +13,7 @@ ******************************************************************************** Installing development files for Debian GNU/Linux: ----------------------------------------------------- -su -c "apt-get install build-essential libjpeg-dev libjasper-dev libz-dev -libpng-dev" +su -c "apt-get install build-essential libjpeg-dev libz-dev libpng-dev" Compiling and installing aaphoto: ---------------------------------------- @@ -43,8 +41,7 @@ To compile the software manually, you should run this from a console: ------------------------------------------------------------------------- -gcc aaphoto.c -o aaphoto -O2 -ljasper -ljpeg -lpng -lz -lm -D__OPENMP__ -fopenmp --lgomp +gcc aaphoto.c -o aaphoto -O2 -ljpeg -lpng -lz -lm -D__OPENMP__ -fopenmp -lgomp ******************************************************************************** diff -Nru aaphoto-0.43.1/Makefile.am aaphoto-0.45/Makefile.am --- aaphoto-0.43.1/Makefile.am 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/Makefile.am 2016-07-09 19:02:20.000000000 +0000 @@ -1,5 +1,4 @@ AM_CFLAGS = -Wall -O2 -D__OPENMP__ -fopenmp -AM_LDFLAGS = -ljasper -ljpeg -lpng -lm -lgomp +AM_LDFLAGS = -ljpeg -lpng -lm -lgomp bin_PROGRAMS = aaphoto aaphoto_SOURCES = aaphoto.c -INCLUDES = diff -Nru aaphoto-0.43.1/Makefile.in aaphoto-0.45/Makefile.in --- aaphoto-0.43.1/Makefile.in 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/Makefile.in 2016-07-09 19:02:20.000000000 +0000 @@ -163,7 +163,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = -Wall -O2 -D__OPENMP__ -fopenmp -AM_LDFLAGS = -ljasper -ljpeg -lpng -lm -lgomp +AM_LDFLAGS = -ljpeg -lpng -lm -lgomp aaphoto_SOURCES = aaphoto.c INCLUDES = all: config.h diff -Nru aaphoto-0.43.1/NEWS aaphoto-0.45/NEWS --- aaphoto-0.43.1/NEWS 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/NEWS 2016-07-09 19:02:20.000000000 +0000 @@ -1,2 +1 @@ -2013/09/30 - aaphoto v0.43 - new aaRGB v0.65 version update (see aaRGB changelog) -2012/02/20 - aaphoto v0.42 - tiny fix to set PNG compression manually and make it compatible with new version of libpng +2016/07/09 - aaphoto v0.45 - fix libpng error: unrecognized unit type for pHYs chunk diff -Nru aaphoto-0.43.1/README aaphoto-0.45/README --- aaphoto-0.43.1/README 2014-01-31 12:17:01.000000000 +0000 +++ aaphoto-0.45/README 2016-07-09 19:02:20.000000000 +0000 @@ -1,15 +1,14 @@ Auto Adjust Photo -Copyright (C) 2006-2013 Andras Horvath +Copyright (C) 2006-2016 Andras Horvath E-mail: mail@log69.com - suggestions & feedbacks are welcome -URL: http://log69.com - the official site -aaphoto (command-line) version - v0.42 +URL: http://log69.com/aaphoto_en.html - the official site +aaphoto (command-line) version - v0.45 aaRGB (color-correction engine) version - v0.64 -last update = 26/09/2013 +last update = 09/07/2016 The following libraries are used by this program: libgomp - OpenMP for parallel programming, http://gcc.gnu.org/onlinedocs/libgomp/ -libjasper - JasPer software, http://www.ece.uvic.ca/~mdadams/jasper/ libjpeg - IJG JPEG software, http://www.ijg.org/ libpng - PNG software, http://www.libpng.org/ libz - Compression library, http://www.zlib.net/ @@ -36,10 +35,10 @@ [HELP] USAGE: aaphoto [options] [source files] -The following image types are supported (thanks to JasPer, JPEG and PNG): -mif, pnm / pgm / ppm, bmp, ras, jp2, jpc, jpg, png +The following image types are supported (thanks to JPEG and PNG): +bmp, jpg, png -Quality settings can be applied only to jp2, jpc, jpg formats +Quality settings can be applied only to jpg format The following options are supported: -h --help Print this help @@ -48,7 +47,6 @@ -o --output Set output directory --overwrite Overwrite mode, the original source file is replaced --jpg JPEG image output - --jp2 JPEG 2000 image output --png PNG image output with alpha channel support --bmp BMP image output -r --resize Resize image taking the longer side in % or pixels @@ -70,7 +68,7 @@ aaphoto -a -r600 -q85 *.jpg aaphoto mydir aaphoto -V --resize70% image.png - aaphoto --quality60 image.jp2 + aaphoto --quality60 image.jpg REMARKS: - auto adjust parameter is set by default without any other parameters