X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=config.status;h=cb70d4cf9791e5513541cf4a03bb32cd2117d232;hb=11e8b2872e4307031d724034e330ee090e365f17;hp=6012008e02c64006e1abec6a35d97b1d332f2a14;hpb=65ecdd3343d0c9bc8359941e56669e962d715425;p=ptask.git diff --git a/config.status b/config.status index 6012008..cb70d4c 100755 --- a/config.status +++ b/config.status @@ -393,7 +393,8 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` " # Files that config.status was made for. -config_files=" Makefile po/Makefile.in src/Makefile src/glade/Makefile tests/Makefile" +config_files=" Makefile icons/hicolor/scalable/Makefile po/Makefile.in src/Makefile src/glade/Makefile tests/Makefile" +config_headers=" config.h" config_commands=" depfiles po-directories" ac_cs_usage="\ @@ -412,17 +413,22 @@ Usage: $0 [OPTION]... [TAG]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Configuration commands: $config_commands Report bugs to . ptask home page: ." -ac_cs_config="" +ac_cs_config="'--prefix=/tmp'" ac_cs_version="\ ptask config.status 0.0.x configured by ./configure, generated by GNU Autoconf 2.69, @@ -478,7 +484,18 @@ do esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) + --header | --heade | --head | --hea ) + $ac_shift + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append CONFIG_HEADERS " '$ac_optarg'" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + as_fn_error $? "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; + --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) @@ -503,7 +520,7 @@ if $ac_cs_silent; then fi if $ac_cs_recheck; then - set X /bin/bash './configure' $ac_configure_extra_args --no-create --no-recursion + set X /bin/bash './configure' '--prefix=/tmp' $ac_configure_extra_args --no-create --no-recursion shift $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6 CONFIG_SHELL='/bin/bash' @@ -537,9 +554,11 @@ AMDEP_TRUE="" ac_aux_dir="." for ac_config_target in $ac_config_targets do case $ac_config_target in + "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "icons/hicolor/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES icons/hicolor/scalable/Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/glade/Makefile") CONFIG_FILES="$CONFIG_FILES src/glade/Makefile" ;; @@ -556,6 +575,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -616,12 +636,59 @@ S["CPPCHECK_FALSE"]="#" S["CPPCHECK_TRUE"]="" S["HAVE_CPPCHECK"]="yes" S["HELP2MAN"]="help2man" -S["JSON_LIBS"]="-ljson " -S["JSON_CFLAGS"]="-I/usr/include/json " +S["GSETTINGS_RULES"]="\n"\ +".PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas\n"\ +"\n"\ +"mostlyclean-am: clean-gsettings-schemas\n"\ +"\n"\ +"gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))\n"\ +"\n"\ +"%.gschema.valid: %.gschema.xml $(gsettings__enum_file)\n"\ +" $(AM_V_GEN) if test -f \"$<\"; then d=; else d=\"$(srcdir)/\"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__e"\ +"num_file)) --schema-file=$${d}$< && touch $@\n"\ +"\n"\ +"all-am: $(gsettings_SCHEMAS:.xml=.valid)\n"\ +"uninstall-am: uninstall-gsettings-schemas\n"\ +"install-data-am: install-gsettings-schemas\n"\ +"\n"\ +".SECONDARY: $(gsettings_SCHEMAS)\n"\ +"\n"\ +"install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)\n"\ +" @$(NORMAL_INSTALL)\n"\ +" if test -n \"$^\"; then \\\n"\ +" test -z \"$(gsettingsschemadir)\" || $(MKDIR_P) \"$(DESTDIR)$(gsettingsschemadir)\"; \\\n"\ +" $(INSTALL_DATA) $^ \"$(DESTDIR)$(gsettingsschemadir)\"; \\\n"\ +" test -n \"$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)\" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \\\n"\ +" fi\n"\ +"\n"\ +"uninstall-gsettings-schemas:\n"\ +" @$(NORMAL_UNINSTALL)\n"\ +" @list='$(gsettings_SCHEMAS) $(gsettings__enum_file)'; test -n \"$(gsettingsschemadir)\" || list=; \\\n"\ +" files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \\\n"\ +" test -n \"$$files\" || exit 0; \\\n"\ +" echo \" ( cd '$(DESTDIR)$(gsettingsschemadir)' && rm -f\" $$files \")\"; \\\n"\ +" cd \"$(DESTDIR)$(gsettingsschemadir)\" && rm -f $$files\n"\ +" test -n \"$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)\" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)\n"\ +"\n"\ +"clean-gsettings-schemas:\n"\ +" rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)\n"\ +"\n"\ +"ifdef gsettings_ENUM_NAMESPACE\n"\ +"$(gsettings__enum_file): $(gsettings_ENUM_FILES)\n"\ +" $(AM_V_GEN) glib-mkenums --comments '' --fhead \"\" --vhead \" <@type@ id='$(gsettings_ENUM_NAMESPACE).@EnumName@'>\" --"\ +"vprod \" \" --vtail \" \" --ftail \"\" $^ > $@.tmp && mv $@.tmp $@\n"\ +"endif\n"\ +"" +S["GLIB_COMPILE_SCHEMAS"]="/usr/lib/x86_64-linux-gnu/glib-2.0/glib-compile-schemas" +S["gsettingsschemadir"]="${datarootdir}/glib-2.0/schemas" +S["GSETTINGS_DISABLE_SCHEMAS_COMPILE"]="" +S["JSON_LIBS"]="-ljson-c " +S["JSON_CFLAGS"]="-I/usr/include/json-c " S["GTK_LIBS"]="-lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lglib-2.0 " S["GTK_CFLAGS"]="-pthread -I/usr/include/gtk-3.0 -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/i"\ -"nclude/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/freetype2 -I/usr/incl"\ -"ude/pixman-1 -I/usr/include/libpng12 -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE " +"nclude/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/harfbuzz -I/usr/inclu"\ +"de/freetype2 -I/usr/include/pixman-1 -I/usr/include/libpng12 -DGTK_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -D"\ +"GSEAL_ENABLE " S["XEXT_LIBS"]="-lXext " S["XEXT_CFLAGS"]=" " S["X11_LIBS"]="-lX11 " @@ -656,7 +723,7 @@ S["GMSGFMT"]="/usr/bin/msgfmt" S["MSGFMT"]="/usr/bin/msgfmt" S["GETTEXT_MACRO_VERSION"]="0.18" S["USE_NLS"]="yes" -S["CPP"]="gcc -E" +S["CPP"]="gcc -std=gnu99 -E" S["XMKMF"]="" S["am__fastdepCC_FALSE"]="#" S["am__fastdepCC_TRUE"]="" @@ -674,7 +741,7 @@ S["ac_ct_CC"]="gcc" S["CPPFLAGS"]="" S["LDFLAGS"]="" S["CFLAGS"]="-g -O2" -S["CC"]="gcc" +S["CC"]="gcc -std=gnu99" S["am__untar"]="$${TAR-tar} xf -" S["am__tar"]="$${TAR-tar} chof - \"$$tardir\"" S["AMTAR"]="$${TAR-tar}" @@ -705,8 +772,7 @@ S["LIBS"]="" S["ECHO_T"]="" S["ECHO_N"]="-n" S["ECHO_C"]="" -S["DEFS"]="-DPACKAGE_NAME=\\\"ptask\\\" -DPACKAGE_TARNAME=\\\"ptask\\\" -DPACKAGE_VERSION=\\\"0.0.x\\\" -DPACKAGE_STRING=\\\"ptask\\ 0.0.x\\\" -DPACKAGE_BUGREPORT=\\\"jeanfi@gmai"\ -"l.com\\\" -DPACKAGE_URL=\\\"http://wpitchoune.net/ptask\\\" -DPACKAGE=\\\"ptask\\\" -DVERSION=\\\"0.0.x\\\" -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1" +S["DEFS"]="-DHAVE_CONFIG_H" S["mandir"]="${datarootdir}/man" S["localedir"]="${datarootdir}/locale" S["libdir"]="${exec_prefix}/lib" @@ -727,7 +793,7 @@ S["libexecdir"]="${exec_prefix}/libexec" S["sbindir"]="${exec_prefix}/sbin" S["bindir"]="${exec_prefix}/bin" S["program_transform_name"]="s,x,x," -S["prefix"]="/usr/local" +S["prefix"]="/tmp" S["exec_prefix"]="${prefix}" S["PACKAGE_URL"]="http://wpitchoune.net/ptask" S["PACKAGE_BUGREPORT"]="jeanfi@gmail.com" @@ -772,8 +838,60 @@ fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# 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 >"$ac_tmp/defines.awk" <<\_ACAWK || +BEGIN { +D["PACKAGE_NAME"]=" \"ptask\"" +D["PACKAGE_TARNAME"]=" \"ptask\"" +D["PACKAGE_VERSION"]=" \"0.0.x\"" +D["PACKAGE_STRING"]=" \"ptask 0.0.x\"" +D["PACKAGE_BUGREPORT"]=" \"jeanfi@gmail.com\"" +D["PACKAGE_URL"]=" \"http://wpitchoune.net/ptask\"" +D["PACKAGE"]=" \"ptask\"" +D["VERSION"]=" \"0.0.x\"" +D["ENABLE_NLS"]=" 1" +D["HAVE_GETTEXT"]=" 1" +D["HAVE_DCGETTEXT"]=" 1" + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+[_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ][_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]*([\t (]|$)/ { + line = $ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 +fi # test -n "$CONFIG_HEADERS" + -eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -994,7 +1112,64 @@ which seems to be undefined. Please make sure it is defined" >&2;} esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; - + :H) + # + # CONFIG_HEADER + # + if test x"$ac_file" != x-; then + { + $as_echo "/* $configure_input */" \ + && 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" "$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 "$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 "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 + fi +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'`/stamp-h$_am_stamp_count + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;}