aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-07-14 06:19:36 -0400
committerGlenn Morris2011-07-14 06:19:36 -0400
commit85c1ab0bc7b3adcd5ba050786fd25754158f64df (patch)
tree327da852c04d3e504b02cf108f675ecd8a9168a5
parentadc47434a27e5f4a9733e657584823508f8ab952 (diff)
downloademacs-85c1ab0bc7b3adcd5ba050786fd25754158f64df.tar.gz
emacs-85c1ab0bc7b3adcd5ba050786fd25754158f64df.zip
Auto-commit of generated files.
-rwxr-xr-xautogen/configure12
1 files changed, 6 insertions, 6 deletions
diff --git a/autogen/configure b/autogen/configure
index a6f85b66e53..f751caec1f5 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -11140,23 +11140,23 @@ fi
11140 else 11140 else
11141 PKG_CONFIG_MIN_VERSION=0.9.0 11141 PKG_CONFIG_MIN_VERSION=0.9.0
11142 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then 11142 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
11143 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.26" >&5 11143 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.26" >&5
11144$as_echo_n "checking for glib-2.0 >= 2.26... " >&6; } 11144$as_echo_n "checking for gio-2.0 >= 2.26... " >&6; }
11145 11145
11146 if $PKG_CONFIG --exists "glib-2.0 >= 2.26" 2>&5; then 11146 if $PKG_CONFIG --exists "gio-2.0 >= 2.26" 2>&5; then
11147 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 11147 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
11148$as_echo "yes" >&6; } 11148$as_echo "yes" >&6; }
11149 succeeded=yes 11149 succeeded=yes
11150 11150
11151 { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5 11151 { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_CFLAGS" >&5
11152$as_echo_n "checking GSETTINGS_CFLAGS... " >&6; } 11152$as_echo_n "checking GSETTINGS_CFLAGS... " >&6; }
11153 GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'` 11153 GSETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'`
11154 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5 11154 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_CFLAGS" >&5
11155$as_echo "$GSETTINGS_CFLAGS" >&6; } 11155$as_echo "$GSETTINGS_CFLAGS" >&6; }
11156 11156
11157 { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5 11157 { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSETTINGS_LIBS" >&5
11158$as_echo_n "checking GSETTINGS_LIBS... " >&6; } 11158$as_echo_n "checking GSETTINGS_LIBS... " >&6; }
11159 GSETTINGS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.26"|sed -e 's,///*,/,g'` 11159 GSETTINGS_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26"|sed -e 's,///*,/,g'`
11160 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5 11160 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSETTINGS_LIBS" >&5
11161$as_echo "$GSETTINGS_LIBS" >&6; } 11161$as_echo "$GSETTINGS_LIBS" >&6; }
11162 else 11162 else
@@ -11166,7 +11166,7 @@ $as_echo "no" >&6; }
11166 GSETTINGS_LIBS="" 11166 GSETTINGS_LIBS=""
11167 ## If we have a custom action on failure, don't print errors, but 11167 ## If we have a custom action on failure, don't print errors, but
11168 ## do set a variable so people can do so. 11168 ## do set a variable so people can do so.
11169 GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.26"` 11169 GSETTINGS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0 >= 2.26"`
11170 11170
11171 fi 11171 fi
11172 11172