diff options
| author | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2002-05-23 22:24:07 +0000 |
|---|---|---|
| committer | Olivier Fourdan <fourdan.olivier@wanadoo.fr> | 2002-05-23 22:24:07 +0000 |
| commit | a8704e5f0674a8e5d6a9be5f548fa80d8953e621 (patch) | |
| tree | 4623a43842a120fd44f0c11f88fe53728089aff6 | |
| parent | 63601f619f381f83e83cee0a8bff01992137f9df (diff) | |
| download | xfwm4-a8704e5f0674a8e5d6a9be5f548fa80d8953e621.tar.gz | |
Improve build process, add automatic xfwm4.spec generation
(Old svn revision: 10335)
47 files changed, 1203 insertions, 512 deletions
@@ -1,17 +1,4 @@ -Authors and Contributors for Oroborus -===================================== - -Author: - Ken Lynch <kenlynch@blueyonder.co.uk> - -Contributors: - Martin Hedenfalk - (border snapping, workspace keys, vertical/horizontal maximizing) - -Acknowledgments: - I would like to thank Decklin Foster for writing AEWM which I used to - help me write Oroborus. I would also like to thank Tomohiro Kubota for - the i18n code which I used to implement i18n support in Oroborus. - - Finally I would like to thank all of you who have helped me to debug and - fine tune Oroborus and make it what it is today. +Oroborus: Ken Lynch <kenlynch@blueyonder.co.uk> +Metacity: Havoc Pennington <hp@redhat.com> +Sawfish: John Harper <jsh@unfactored.org> +xfwm4: Olivier Fourdan <fourdan@xfce.org> diff --git a/Makefile.am b/Makefile.am index 16ffba294..fbccee1c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,14 @@ -EXTRA_DIST = example.xfwm4rc +@SET_MAKE@ + +EXTRA_DIST = example.xfwm4rc example.xfwm4rc.in xfwm4.spec xfwm4.spec.in SUBDIRS = src defaults themes distclean-local: - rm -f example.xfwm4rc + rm -f example.xfwm4rc xfwm4.spec + +example.xfwm4rc : + @sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" example.xfwm4rc.in > example.xfwm4rc + +rpm : dist + rpm -ta $(PACKAGE)-$(VERSION).tar.gz diff --git a/Makefile.in b/Makefile.in index eec5c4dd8..e3772da67 100644 --- a/Makefile.in +++ b/Makefile.in @@ -62,18 +62,17 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -EXTRA_DIST = example.xfwm4rc +EXTRA_DIST = example.xfwm4rc example.xfwm4rc.in xfwm4.spec xfwm4.spec.in SUBDIRS = src defaults themes ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = xfwm4.spec DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in \ -configure configure.in install-sh missing mkinstalldirs +configure configure.in install-sh missing mkinstalldirs xfwm4.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -124,6 +123,8 @@ distclean-hdr: -rm -f config.h maintainer-clean-hdr: +xfwm4.spec: $(top_builddir)/config.status xfwm4.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -347,8 +348,16 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +@SET_MAKE@ + distclean-local: - rm -f example.xfwm4rc + rm -f example.xfwm4rc xfwm4.spec + +example.xfwm4rc : + @sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" example.xfwm4rc.in > example.xfwm4rc + +rpm : dist + rpm -ta $(PACKAGE)-$(VERSION).tar.gz # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 000000000..2e4c9e527 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +aclocal --verbose \ + && autoheader \ + && automake --add-missing --copy --include-deps --foreign --gnu --verbose \ + && autoconf \ + && ./configure $@ @@ -937,6 +937,7 @@ fi PATH_SEPARATOR="$ac_path_separator" rm -f conftest.sh +VERSION=`date +%y%m%d` ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -954,7 +955,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:957: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:958: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -974,7 +975,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:977: checking for a BSD compatible install" >&5 +echo "$as_me:978: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -1023,7 +1024,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1026: result: $INSTALL" >&5 +echo "$as_me:1027: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1034,7 +1035,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1037: checking whether build environment is sane" >&5 +echo "$as_me:1038: checking whether build environment is sane" >&5 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 # Just in case sleep 1 @@ -1057,7 +1058,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:1060: error: ls -t appears to fail. Make sure there is not a broken + { { echo "$as_me:1061: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} @@ -1070,14 +1071,14 @@ then # Ok. : else - { { echo "$as_me:1073: error: newly created file is older than distributed files! + { { echo "$as_me:1074: error: newly created file is older than distributed files! Check your system clock" >&5 echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest* -echo "$as_me:1080: result: yes" >&5 +echo "$as_me:1081: result: yes" >&5 echo "${ECHO_T}yes" >&6 test "$program_prefix" != NONE && program_transform_name="s,^,$program_prefix,;$program_transform_name" @@ -1092,7 +1093,7 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed -echo "$as_me:1095: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "$as_me:1096: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then @@ -1112,21 +1113,21 @@ fi rm -f conftest.make fi if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:1115: result: yes" >&5 + echo "$as_me:1116: result: yes" >&5 echo "${ECHO_T}yes" >&6 SET_MAKE= else - echo "$as_me:1119: result: no" >&5 + echo "$as_me:1120: result: no" >&5 echo "${ECHO_T}no" >&6 SET_MAKE="MAKE=${MAKE-make}" fi PACKAGE=xfwm4 -VERSION=0.0.100 +VERSION=$VERSION if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:1129: error: source directory already configured; run \"make distclean\" there first" >&5 + { { echo "$as_me:1130: error: source directory already configured; run \"make distclean\" there first" >&5 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } fi @@ -1140,78 +1141,78 @@ cat >>confdefs.h <<EOF EOF missing_dir=`cd $ac_aux_dir && pwd` -echo "$as_me:1143: checking for working aclocal" >&5 +echo "$as_me:1144: checking for working aclocal" >&5 echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (aclocal --version) < /dev/null > /dev/null 2>&1; then ACLOCAL=aclocal - echo "$as_me:1150: result: found" >&5 + echo "$as_me:1151: result: found" >&5 echo "${ECHO_T}found" >&6 else ACLOCAL="$missing_dir/missing aclocal" - echo "$as_me:1154: result: missing" >&5 + echo "$as_me:1155: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1158: checking for working autoconf" >&5 +echo "$as_me:1159: checking for working autoconf" >&5 echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoconf --version) < /dev/null > /dev/null 2>&1; then AUTOCONF=autoconf - echo "$as_me:1165: result: found" >&5 + echo "$as_me:1166: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOCONF="$missing_dir/missing autoconf" - echo "$as_me:1169: result: missing" >&5 + echo "$as_me:1170: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1173: checking for working automake" >&5 +echo "$as_me:1174: checking for working automake" >&5 echo $ECHO_N "checking for working automake... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (automake --version) < /dev/null > /dev/null 2>&1; then AUTOMAKE=automake - echo "$as_me:1180: result: found" >&5 + echo "$as_me:1181: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOMAKE="$missing_dir/missing automake" - echo "$as_me:1184: result: missing" >&5 + echo "$as_me:1185: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1188: checking for working autoheader" >&5 +echo "$as_me:1189: checking for working autoheader" >&5 echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (autoheader --version) < /dev/null > /dev/null 2>&1; then AUTOHEADER=autoheader - echo "$as_me:1195: result: found" >&5 + echo "$as_me:1196: result: found" >&5 echo "${ECHO_T}found" >&6 else AUTOHEADER="$missing_dir/missing autoheader" - echo "$as_me:1199: result: missing" >&5 + echo "$as_me:1200: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi -echo "$as_me:1203: checking for working makeinfo" >&5 +echo "$as_me:1204: checking for working makeinfo" >&5 echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. if (makeinfo --version) < /dev/null > /dev/null 2>&1; then MAKEINFO=makeinfo - echo "$as_me:1210: result: found" >&5 + echo "$as_me:1211: result: found" >&5 echo "${ECHO_T}found" >&6 else MAKEINFO="$missing_dir/missing makeinfo" - echo "$as_me:1214: result: missing" >&5 + echo "$as_me:1215: result: missing" >&5 echo "${ECHO_T}missing" >&6 fi @@ -1219,6 +1220,9 @@ ac_config_headers="$ac_config_headers config.h" ac_config_commands="$ac_config_commands default-1" +# Honor aclocal flags +ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -1227,7 +1231,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:1230: checking for $ac_word" >&5 +echo "$as_me:1234: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1242,7 +1246,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}gcc" -echo "$as_me:1245: found $ac_dir/$ac_word" >&5 +echo "$as_me:1249: found $ac_dir/$ac_word" >&5 break done @@ -1250,10 +1254,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1253: result: $CC" >&5 + echo "$as_me:1257: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1256: result: no" >&5 + echo "$as_me:1260: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1262,7 +1266,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:1265: checking for $ac_word" >&5 +echo "$as_me:1269: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1277,7 +1281,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="gcc" -echo "$as_me:1280: found $ac_dir/$ac_word" >&5 +echo "$as_me:1284: found $ac_dir/$ac_word" >&5 break done @@ -1285,10 +1289,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1288: result: $ac_ct_CC" >&5 + echo "$as_me:1292: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1291: result: no" >&5 + echo "$as_me:1295: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1301,7 +1305,7 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:1304: checking for $ac_word" >&5 +echo "$as_me:1308: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1316,7 +1320,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="${ac_tool_prefix}cc" -echo "$as_me:1319: found $ac_dir/$ac_word" >&5 +echo "$as_me:1323: found $ac_dir/$ac_word" >&5 break done @@ -1324,10 +1328,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1327: result: $CC" >&5 + echo "$as_me:1331: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1330: result: no" >&5 + echo "$as_me:1334: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1336,7 +1340,7 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1339: checking for $ac_word" >&5 +echo "$as_me:1343: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1351,7 +1355,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="cc" -echo "$as_me:1354: found $ac_dir/$ac_word" >&5 +echo "$as_me:1358: found $ac_dir/$ac_word" >&5 break done @@ -1359,10 +1363,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1362: result: $ac_ct_CC" >&5 + echo "$as_me:1366: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1365: result: no" >&5 + echo "$as_me:1369: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1375,7 +1379,7 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:1378: checking for $ac_word" >&5 +echo "$as_me:1382: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1395,7 +1399,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then continue fi ac_cv_prog_CC="cc" -echo "$as_me:1398: found $ac_dir/$ac_word" >&5 +echo "$as_me:1402: found $ac_dir/$ac_word" >&5 break done @@ -1417,10 +1421,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1420: result: $CC" >&5 + echo "$as_me:1424: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1423: result: no" >&5 + echo "$as_me:1427: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1431,7 +1435,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:1434: checking for $ac_word" >&5 +echo "$as_me:1438: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1446,7 +1450,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -echo "$as_me:1449: found $ac_dir/$ac_word" >&5 +echo "$as_me:1453: found $ac_dir/$ac_word" >&5 break done @@ -1454,10 +1458,10 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1457: result: $CC" >&5 + echo "$as_me:1461: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1460: result: no" >&5 + echo "$as_me:1464: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1470,7 +1474,7 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:1473: checking for $ac_word" >&5 +echo "$as_me:1477: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1485,7 +1489,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. $as_executable_p "$ac_dir/$ac_word" || continue ac_cv_prog_ac_ct_CC="$ac_prog" -echo "$as_me:1488: found $ac_dir/$ac_word" >&5 +echo "$as_me:1492: found $ac_dir/$ac_word" >&5 break done @@ -1493,10 +1497,10 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1496: result: $ac_ct_CC" >&5 + echo "$as_me:1500: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1499: result: no" >&5 + echo "$as_me:1503: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1508,32 +1512,32 @@ fi fi -test -z "$CC" && { { echo "$as_me:1511: error: no acceptable cc found in \$PATH" >&5 +test -z "$CC" && { { echo "$as_me:1515: error: no acceptable cc found in \$PATH" >&5 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1516:" \ +echo "$as_me:1520:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1519: \"$ac_compiler --version </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1523: \"$ac_compiler --version </dev/null >&5\"") >&5 (eval $ac_compiler --version </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1522: \$? = $ac_status" >&5 + echo "$as_me:1526: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1524: \"$ac_compiler -v </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1528: \"$ac_compiler -v </dev/null >&5\"") >&5 (eval $ac_compiler -v </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1527: \$? = $ac_status" >&5 + echo "$as_me:1531: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1529: \"$ac_compiler -V </dev/null >&5\"") >&5 +{ (eval echo "$as_me:1533: \"$ac_compiler -V </dev/null >&5\"") >&5 (eval $ac_compiler -V </dev/null >&5) 2>&5 ac_status=$? - echo "$as_me:1532: \$? = $ac_status" >&5 + echo "$as_me:1536: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1536 "configure" +#line 1540 "configure" #include "confdefs.h" int @@ -1549,13 +1553,13 @@ ac_clean_files="$ac_clean_files a.out a.exe" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:1552: checking for C compiler default output" >&5 +echo "$as_me:1556: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:1555: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1559: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1558: \$? = $ac_status" >&5 + echo "$as_me:1562: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last @@ -1578,34 +1582,34 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1581: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1585: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:1587: result: $ac_file" >&5 +echo "$as_me:1591: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1592: checking whether the C compiler works" >&5 +echo "$as_me:1596: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1598: \"$ac_try\"") >&5 + { (eval echo "$as_me:1602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1601: \$? = $ac_status" >&5 + echo "$as_me:1605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1608: error: cannot run C compiled programs. + { { echo "$as_me:1612: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1613,24 +1617,24 @@ If you meant to cross compile, use \`--host'." >&2;} fi fi fi -echo "$as_me:1616: result: yes" >&5 +echo "$as_me:1620: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:1623: checking whether we are cross compiling" >&5 +echo "$as_me:1627: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1625: result: $cross_compiling" >&5 +echo "$as_me:1629: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1628: checking for executable suffix" >&5 +echo "$as_me:1632: checking for executable suffix" >&5 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1630: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1634: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1633: \$? = $ac_status" >&5 + echo "$as_me:1637: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1646,25 +1650,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do esac done else - { { echo "$as_me:1649: error: cannot compute EXEEXT: cannot compile and link" >&5 + { { echo "$as_me:1653: error: cannot compute EXEEXT: cannot compile and link" >&5 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1655: result: $ac_cv_exeext" >&5 +echo "$as_me:1659: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1661: checking for object suffix" >&5 +echo "$as_me:1665: checking for object suffix" >&5 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1667 "configure" +#line 1671 "configure" #include "confdefs.h" int @@ -1676,10 +1680,10 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1679: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1683: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1682: \$? = $ac_status" >&5 + echo "$as_me:1686: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1691,24 +1695,24 @@ done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1694: error: cannot compute OBJEXT: cannot compile" >&5 +{ { echo "$as_me:1698: error: cannot compute OBJEXT: cannot compile" >&5 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1701: result: $ac_cv_objext" >&5 +echo "$as_me:1705: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1705: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:1709: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1711 "configure" +#line 1715 "configure" #include "confdefs.h" int @@ -1723,16 +1727,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1726: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1729: \$? = $ac_status" >&5 + echo "$as_me:1733: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1732: \"$ac_try\"") >&5 + { (eval echo "$as_me:1736: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1735: \$? = $ac_status" >&5 + echo "$as_me:1739: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1744,19 +1748,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1747: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1751: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1753: checking whether $CC accepts -g" >&5 +echo "$as_me:1757: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1759 "configure" +#line 1763 "configure" #include "confdefs.h" int @@ -1768,16 +1772,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1771: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1775: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1774: \$? = $ac_status" >&5 + echo "$as_me:1778: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1777: \"$ac_try\"") >&5 + { (eval echo "$as_me:1781: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1780: \$? = $ac_status" >&5 + echo "$as_me:1784: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1787,7 +1791,7 @@ ac_cv_prog_cc_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1790: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1794: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1814,16 +1818,16 @@ cat >conftest.$ac_ext <<_ACEOF #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1817: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1821: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1820: \$? = $ac_status" >&5 + echo "$as_me:1824: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1823: \"$ac_try\"") >&5 + { (eval echo "$as_me:1827: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1826: \$? = $ac_status" >&5 + echo "$as_me:1830: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1835,7 +1839,7 @@ if { (eval echo "$as_me:1817: \"$ac_compile\"") >&5 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1838 "configure" +#line 1842 "configure" #include "confdefs.h" #include <stdlib.h> $ac_declaration @@ -1848,16 +1852,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1851: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1854: \$? = $ac_status" >&5 + echo "$as_me:1858: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1857: \"$ac_try\"") >&5 + { (eval echo "$as_me:1861: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1860: \$? = $ac_status" >&5 + echo "$as_me:1864: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1867,7 +1871,7 @@ continue fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1870 "configure" +#line 1874 "configure" #include "confdefs.h" $ac_declaration int @@ -1879,16 +1883,16 @@ exit (42); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1882: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1885: \$? = $ac_status" >&5 + echo "$as_me:1889: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1888: \"$ac_try\"") >&5 + { (eval echo "$as_me:1892: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1891: \$? = $ac_status" >&5 + echo "$as_me:1895: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1927,7 +1931,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:1930: checking for a BSD compatible install" >&5 +echo "$as_me:1934: checking for a BSD compatible install" >&5 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then @@ -1976,7 +1980,7 @@ fi INSTALL=$ac_install_sh fi fi -echo "$as_me:1979: result: $INSTALL" >&5 +echo "$as_me:1983: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -1987,7 +1991,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:1990: checking for $CC option to accept ANSI C" >&5 +echo "$as_me:1994: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1995,7 +1999,7 @@ else ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 1998 "configure" +#line 2002 "configure" #include "confdefs.h" #include <stdarg.h> #include <stdio.h> @@ -2044,16 +2048,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2047: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2050: \$? = $ac_status" >&5 + echo "$as_me:2054: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2053: \"$ac_try\"") >&5 + { (eval echo "$as_me:2057: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2056: \$? = $ac_status" >&5 + echo "$as_me:2060: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2070,15 +2074,15 @@ fi case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2073: result: none needed" >&5 + echo "$as_me:2077: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2076: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:2080: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:2081: checking for inline" >&5 +echo "$as_me:2085: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2086,7 +2090,7 @@ else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 2089 "configure" +#line 2093 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -2095,16 +2099,16 @@ $ac_kw int foo () {return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2098: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2102: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2101: \$? = $ac_status" >&5 + echo "$as_me:2105: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2104: \"$ac_try\"") >&5 + { (eval echo "$as_me:2108: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2107: \$? = $ac_status" >&5 + echo "$as_me:2111: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -2115,7 +2119,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext done fi -echo "$as_me:2118: result: $ac_cv_c_inline" >&5 +echo "$as_me:2122: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; @@ -2130,13 +2134,13 @@ EOF ;; esac -echo "$as_me:2133: checking for an ANSI C-conforming const" >&5 +echo "$as_me:2137: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2139 "configure" +#line 2143 "configure" #include "confdefs.h" int @@ -2194,16 +2198,16 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2197: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2200: \$? = $ac_status" >&5 + echo "$as_me:2204: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2203: \"$ac_try\"") >&5 + { (eval echo "$as_me:2207: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2206: \$? = $ac_status" >&5 + echo "$as_me:2210: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_const=yes else @@ -2213,7 +2217,7 @@ ac_cv_c_const=no fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:2216: result: $ac_cv_c_const" >&5 +echo "$as_me:2220: result: $ac_cv_c_const" >&5 echo "${ECHO_T}$ac_cv_c_const" >&6 if test $ac_cv_c_const = no; then @@ -2228,7 +2232,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2231: checking how to run the C preprocessor" >&5 +echo "$as_me:2235: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -2249,18 +2253,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2252 "configure" +#line 2256 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2257: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2261: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2263: \$? = $ac_status" >&5 + echo "$as_me:2267: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2283,17 +2287,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2286 "configure" +#line 2290 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2290: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2294: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2296: \$? = $ac_status" >&5 + echo "$as_me:2300: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2330,7 +2334,7 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:2333: result: $CPP" >&5 +echo "$as_me:2337: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2340,18 +2344,18 @@ do # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat >conftest.$ac_ext <<_ACEOF -#line 2343 "configure" +#line 2347 "configure" #include "confdefs.h" #include <assert.h> Syntax error _ACEOF -if { (eval echo "$as_me:2348: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2352: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2354: \$? = $ac_status" >&5 + echo "$as_me:2358: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2374,17 +2378,17 @@ rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 2377 "configure" +#line 2381 "configure" #include "confdefs.h" #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:2381: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2385: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2387: \$? = $ac_status" >&5 + echo "$as_me:2391: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2412,7 +2416,7 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:2415: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2419: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2423,7 +2427,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:2426: checking for X" >&5 +echo "$as_me:2430: checking for X" >&5 echo $ECHO_N "checking for X... $ECHO_C" >&6 # Check whether --with-x or --without-x was given. @@ -2520,17 +2524,17 @@ if test "$ac_x_includes" = no; then # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF -#line 2523 "configure" +#line 2527 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> _ACEOF -if { (eval echo "$as_me:2527: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2531: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:2533: \$? = $ac_status" >&5 + echo "$as_me:2537: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2563,7 +2567,7 @@ if test "$ac_x_libraries" = no; then ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2566 "configure" +#line 2570 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int @@ -2575,16 +2579,16 @@ XtMalloc (0) } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2578: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2582: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2581: \$? = $ac_status" >&5 + echo "$as_me:2585: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2584: \"$ac_try\"") >&5 + { (eval echo "$as_me:2588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2587: \$? = $ac_status" >&5 + echo "$as_me:2591: \$? = $ac_status" >&5 (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. @@ -2622,7 +2626,7 @@ fi fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:2625: result: $have_x" >&5 + echo "$as_me:2629: result: $have_x" >&5 echo "${ECHO_T}$have_x" >&6 no_x=yes else @@ -2632,7 +2636,7 @@ else # Update the cache value to reflect the command line values. ac_cv_have_x="have_x=yes \ ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:2635: result: libraries $x_libraries, headers $x_includes" >&5 + echo "$as_me:2639: result: libraries $x_libraries, headers $x_includes" >&5 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi @@ -2656,11 +2660,11 @@ else # others require no space. Words are not sufficient . . . . case `(uname -sr) 2>/dev/null` in "SunOS 5"*) - echo "$as_me:2659: checking whether -R must be followed by a space" >&5 + echo "$as_me:2663: checking whether -R must be followed by a space" >&5 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 2663 "configure" +#line 2667 "configure" #include "confdefs.h" int @@ -2672,16 +2676,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2675: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2679: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2678: \$? = $ac_status" >&5 + echo "$as_me:2682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2681: \"$ac_try\"") >&5 + { (eval echo "$as_me:2685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2684: \$? = $ac_status" >&5 + echo "$as_me:2688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_nospace=yes else @@ -2691,13 +2695,13 @@ ac_R_nospace=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_nospace = yes; then - echo "$as_me:2694: result: no" >&5 + echo "$as_me:2698: result: no" >&5 echo "${ECHO_T}no" >&6 X_LIBS="$X_LIBS -R$x_libraries" else LIBS="$ac_xsave_LIBS -R $x_libraries" cat >conftest.$ac_ext <<_ACEOF -#line 2700 "configure" +#line 2704 "configure" #include "confdefs.h" int @@ -2709,16 +2713,16 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2712: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2716: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2715: \$? = $ac_status" >&5 + echo "$as_me:2719: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2718: \"$ac_try\"") >&5 + { (eval echo "$as_me:2722: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2721: \$? = $ac_status" >&5 + echo "$as_me:2725: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_R_space=yes else @@ -2728,11 +2732,11 @@ ac_R_space=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext if test $ac_R_space = yes; then - echo "$as_me:2731: result: yes" >&5 + echo "$as_me:2735: result: yes" >&5 echo "${ECHO_T}yes" >&6 X_LIBS="$X_LIBS -R $x_libraries" else - echo "$as_me:2735: result: neither works" >&5 + echo "$as_me:2739: result: neither works" >&5 echo "${ECHO_T}neither works" >&6 fi fi @@ -2752,7 +2756,7 @@ echo "${ECHO_T}neither works" >&6 # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" cat >conftest.$ac_ext <<_ACEOF -#line 2755 "configure" +#line 2759 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2771,22 +2775,22 @@ XOpenDisplay (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2774: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2778: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2777: \$? = $ac_status" >&5 + echo "$as_me:2781: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2780: \"$ac_try\"") >&5 + { (eval echo "$as_me:2784: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2783: \$? = $ac_status" >&5 + echo "$as_me:2787: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:2789: checking for dnet_ntoa in -ldnet" >&5 +echo "$as_me:2793: checking for dnet_ntoa in -ldnet" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2794,7 +2798,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2797 "configure" +#line 2801 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2813,16 +2817,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2816: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2820: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2819: \$? = $ac_status" >&5 + echo "$as_me:2823: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2822: \"$ac_try\"") >&5 + { (eval echo "$as_me:2826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2825: \$? = $ac_status" >&5 + echo "$as_me:2829: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else @@ -2833,14 +2837,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2836: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "$as_me:2840: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:2843: checking for dnet_ntoa in -ldnet_stub" >&5 + echo "$as_me:2847: checking for dnet_ntoa in -ldnet_stub" >&5 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2848,7 +2852,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2851 "configure" +#line 2855 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2867,16 +2871,16 @@ dnet_ntoa (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2870: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2874: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2873: \$? = $ac_status" >&5 + echo "$as_me:2877: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2876: \"$ac_try\"") >&5 + { (eval echo "$as_me:2880: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2879: \$? = $ac_status" >&5 + echo "$as_me:2883: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else @@ -2887,7 +2891,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:2890: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "$as_me:2894: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" @@ -2906,13 +2910,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:2909: checking for gethostbyname" >&5 + echo "$as_me:2913: checking for gethostbyname" >&5 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 if test "${ac_cv_func_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 2915 "configure" +#line 2919 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname (); below. */ @@ -2943,16 +2947,16 @@ f = gethostbyname; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2946: \"$ac_link\"") >&5 +if { (eval echo "$as_me:2950: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2949: \$? = $ac_status" >&5 + echo "$as_me:2953: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2952: \"$ac_try\"") >&5 + { (eval echo "$as_me:2956: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2955: \$? = $ac_status" >&5 + echo "$as_me:2959: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_gethostbyname=yes else @@ -2962,11 +2966,11 @@ ac_cv_func_gethostbyname=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:2965: result: $ac_cv_func_gethostbyname" >&5 +echo "$as_me:2969: result: $ac_cv_func_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:2969: checking for gethostbyname in -lnsl" >&5 + echo "$as_me:2973: checking for gethostbyname in -lnsl" >&5 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2974,7 +2978,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2977 "configure" +#line 2981 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2993,16 +2997,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2996: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3000: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2999: \$? = $ac_status" >&5 + echo "$as_me:3003: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3002: \"$ac_try\"") >&5 + { (eval echo "$as_me:3006: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3005: \$? = $ac_status" >&5 + echo "$as_me:3009: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else @@ -3013,14 +3017,14 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3016: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "$as_me:3020: result: $ac_cv_lib_nsl_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:3023: checking for gethostbyname in -lbsd" >&5 + echo "$as_me:3027: checking for gethostbyname in -lbsd" >&5 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3028,7 +3032,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3031 "configure" +#line 3035 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3047,16 +3051,16 @@ gethostbyname (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3050: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3054: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3053: \$? = $ac_status" >&5 + echo "$as_me:3057: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3056: \"$ac_try\"") >&5 + { (eval echo "$as_me:3060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3059: \$? = $ac_status" >&5 + echo "$as_me:3063: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else @@ -3067,7 +3071,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3070: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "$as_me:3074: result: $ac_cv_lib_bsd_gethostbyname" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" @@ -3083,13 +3087,13 @@ fi # variants that don't use the nameserver (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:3086: checking for connect" >&5 + echo "$as_me:3090: checking for connect" >&5 echo $ECHO_N "checking for connect... $ECHO_C" >&6 if test "${ac_cv_func_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3092 "configure" +#line 3096 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect (); below. */ @@ -3120,16 +3124,16 @@ f = connect; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3123: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3126: \$? = $ac_status" >&5 + echo "$as_me:3130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3129: \"$ac_try\"") >&5 + { (eval echo "$as_me:3133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3132: \$? = $ac_status" >&5 + echo "$as_me:3136: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_connect=yes else @@ -3139,11 +3143,11 @@ ac_cv_func_connect=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3142: result: $ac_cv_func_connect" >&5 +echo "$as_me:3146: result: $ac_cv_func_connect" >&5 echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - echo "$as_me:3146: checking for connect in -lsocket" >&5 + echo "$as_me:3150: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3151,7 +3155,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3154 "configure" +#line 3158 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3170,16 +3174,16 @@ connect (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3173: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3177: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3176: \$? = $ac_status" >&5 + echo "$as_me:3180: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3179: \"$ac_try\"") >&5 + { (eval echo "$as_me:3183: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3182: \$? = $ac_status" >&5 + echo "$as_me:3186: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -3190,7 +3194,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3193: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:3197: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" @@ -3199,13 +3203,13 @@ fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:3202: checking for remove" >&5 + echo "$as_me:3206: checking for remove" >&5 echo $ECHO_N "checking for remove... $ECHO_C" >&6 if test "${ac_cv_func_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3208 "configure" +#line 3212 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove (); below. */ @@ -3236,16 +3240,16 @@ f = remove; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3239: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3243: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3242: \$? = $ac_status" >&5 + echo "$as_me:3246: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3245: \"$ac_try\"") >&5 + { (eval echo "$as_me:3249: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3248: \$? = $ac_status" >&5 + echo "$as_me:3252: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_remove=yes else @@ -3255,11 +3259,11 @@ ac_cv_func_remove=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3258: result: $ac_cv_func_remove" >&5 +echo "$as_me:3262: result: $ac_cv_func_remove" >&5 echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - echo "$as_me:3262: checking for remove in -lposix" >&5 + echo "$as_me:3266: checking for remove in -lposix" >&5 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 if test "${ac_cv_lib_posix_remove+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3267,7 +3271,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3270 "configure" +#line 3274 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3286,16 +3290,16 @@ remove (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3289: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3293: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3292: \$? = $ac_status" >&5 + echo "$as_me:3296: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3295: \"$ac_try\"") >&5 + { (eval echo "$as_me:3299: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3298: \$? = $ac_status" >&5 + echo "$as_me:3302: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else @@ -3306,7 +3310,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3309: result: $ac_cv_lib_posix_remove" >&5 +echo "$as_me:3313: result: $ac_cv_lib_posix_remove" >&5 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" @@ -3315,13 +3319,13 @@ fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:3318: checking for shmat" >&5 + echo "$as_me:3322: checking for shmat" >&5 echo $ECHO_N "checking for shmat... $ECHO_C" >&6 if test "${ac_cv_func_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3324 "configure" +#line 3328 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat (); below. */ @@ -3352,16 +3356,16 @@ f = shmat; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3355: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3359: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3358: \$? = $ac_status" >&5 + echo "$as_me:3362: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3361: \"$ac_try\"") >&5 + { (eval echo "$as_me:3365: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3364: \$? = $ac_status" >&5 + echo "$as_me:3368: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_shmat=yes else @@ -3371,11 +3375,11 @@ ac_cv_func_shmat=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3374: result: $ac_cv_func_shmat" >&5 +echo "$as_me:3378: result: $ac_cv_func_shmat" >&5 echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - echo "$as_me:3378: checking for shmat in -lipc" >&5 + echo "$as_me:3382: checking for shmat in -lipc" >&5 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 if test "${ac_cv_lib_ipc_shmat+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3383,7 +3387,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3386 "configure" +#line 3390 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3402,16 +3406,16 @@ shmat (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3405: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3409: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3408: \$? = $ac_status" >&5 + echo "$as_me:3412: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3411: \"$ac_try\"") >&5 + { (eval echo "$as_me:3415: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3414: \$? = $ac_status" >&5 + echo "$as_me:3418: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else @@ -3422,7 +3426,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3425: result: $ac_cv_lib_ipc_shmat" >&5 +echo "$as_me:3429: result: $ac_cv_lib_ipc_shmat" >&5 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" @@ -3440,7 +3444,7 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - echo "$as_me:3443: checking for IceConnectionNumber in -lICE" >&5 + echo "$as_me:3447: checking for IceConnectionNumber in -lICE" >&5 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3448,7 +3452,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3451 "configure" +#line 3455 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3467,16 +3471,16 @@ IceConnectionNumber (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3470: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3474: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3473: \$? = $ac_status" >&5 + echo "$as_me:3477: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3476: \"$ac_try\"") >&5 + { (eval echo "$as_me:3480: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3479: \$? = $ac_status" >&5 + echo "$as_me:3483: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else @@ -3487,7 +3491,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3490: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "$as_me:3494: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" @@ -3497,13 +3501,13 @@ fi fi -echo "$as_me:3500: checking for ANSI C header files" >&5 +echo "$as_me:3504: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3506 "configure" +#line 3510 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3511,13 +3515,13 @@ else #include <float.h> _ACEOF -if { (eval echo "$as_me:3514: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3518: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3520: \$? = $ac_status" >&5 + echo "$as_me:3524: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3539,7 +3543,7 @@ rm -f conftest.err conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 3542 "configure" +#line 3546 "configure" #include "confdefs.h" #include <string.h> @@ -3557,7 +3561,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat >conftest.$ac_ext <<_ACEOF -#line 3560 "configure" +#line 3564 "configure" #include "confdefs.h" #include <stdlib.h> @@ -3578,7 +3582,7 @@ if test $ac_cv_header_stdc = yes; then : else cat >conftest.$ac_ext <<_ACEOF -#line 3581 "configure" +#line 3585 "configure" #include "confdefs.h" #include <ctype.h> #if ((' ' & 0x0FF) == 0x020) @@ -3604,15 +3608,15 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3607: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3611: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3610: \$? = $ac_status" >&5 + echo "$as_me:3614: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3612: \"$ac_try\"") >&5 + { (eval echo "$as_me:3616: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3615: \$? = $ac_status" >&5 + echo "$as_me:3619: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -3625,7 +3629,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -echo "$as_me:3628: result: $ac_cv_header_stdc" >&5 +echo "$as_me:3632: result: $ac_cv_header_stdc" >&5 echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then @@ -3638,23 +3642,23 @@ fi for ac_header in stdlib.h string.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3641: checking for $ac_header" >&5 +echo "$as_me:3645: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3647 "configure" +#line 3651 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3651: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:3655: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:3657: \$? = $ac_status" >&5 + echo "$as_me:3661: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -3673,7 +3677,7 @@ else fi rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:3676: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:3680: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<EOF @@ -3683,7 +3687,7 @@ EOF fi done -echo "$as_me:3686: checking for main in -lX11" >&5 +echo "$as_me:3690: checking for main in -lX11" >&5 echo $ECHO_N "checking for main in -lX11... $ECHO_C" >&6 if test "${ac_cv_lib_X11_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3691,7 +3695,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3694 "configure" +#line 3698 "configure" #include "confdefs.h" int @@ -3703,16 +3707,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3706: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3710: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3709: \$? = $ac_status" >&5 + echo "$as_me:3713: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3712: \"$ac_try\"") >&5 + { (eval echo "$as_me:3716: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3715: \$? = $ac_status" >&5 + echo "$as_me:3719: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_X11_main=yes else @@ -3723,7 +3727,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3726: result: $ac_cv_lib_X11_main" >&5 +echo "$as_me:3730: result: $ac_cv_lib_X11_main" >&5 echo "${ECHO_T}$ac_cv_lib_X11_main" >&6 if test $ac_cv_lib_X11_main = yes; then cat >>confdefs.h <<EOF @@ -3733,12 +3737,12 @@ EOF LIBS="-lX11 $LIBS" else - { { echo "$as_me:3736: error: libX11 is missing from your system: Make sure you have both the X Window System libraries and development headers correctly installed" >&5 + { { echo "$as_me:3740: error: libX11 is missing from your system: Make sure you have both the X Window System libraries and development headers correctly installed" >&5 echo "$as_me: error: libX11 is missing from your system: Make sure you have both the X Window System libraries and development headers correctly installed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:3741: checking for main in -lXext" >&5 +echo "$as_me:3745: checking for main in -lXext" >&5 echo $ECHO_N "checking for main in -lXext... $ECHO_C" >&6 if test "${ac_cv_lib_Xext_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3746,7 +3750,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXext $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3749 "configure" +#line 3753 "configure" #include "confdefs.h" int @@ -3758,16 +3762,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3761: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3765: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3764: \$? = $ac_status" >&5 + echo "$as_me:3768: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3767: \"$ac_try\"") >&5 + { (eval echo "$as_me:3771: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3770: \$? = $ac_status" >&5 + echo "$as_me:3774: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xext_main=yes else @@ -3778,7 +3782,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3781: result: $ac_cv_lib_Xext_main" >&5 +echo "$as_me:3785: result: $ac_cv_lib_Xext_main" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_main" >&6 if test $ac_cv_lib_Xext_main = yes; then cat >>confdefs.h <<EOF @@ -3788,12 +3792,12 @@ EOF LIBS="-lXext $LIBS" else - { { echo "$as_me:3791: error: The X Window System installed on this machine does not support the shape extension" >&5 + { { echo "$as_me:3795: error: The X Window System installed on this machine does not support the shape extension" >&5 echo "$as_me: error: The X Window System installed on this machine does not support the shape extension" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:3796: checking for main in -lXpm" >&5 +echo "$as_me:3800: checking for main in -lXpm" >&5 echo $ECHO_N "checking for main in -lXpm... $ECHO_C" >&6 if test "${ac_cv_lib_Xpm_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3801,7 +3805,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 3804 "configure" +#line 3808 "configure" #include "confdefs.h" int @@ -3813,16 +3817,16 @@ main (); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3816: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3820: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3819: \$? = $ac_status" >&5 + echo "$as_me:3823: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3822: \"$ac_try\"") >&5 + { (eval echo "$as_me:3826: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3825: \$? = $ac_status" >&5 + echo "$as_me:3829: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_Xpm_main=yes else @@ -3833,7 +3837,7 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:3836: result: $ac_cv_lib_Xpm_main" >&5 +echo "$as_me:3840: result: $ac_cv_lib_Xpm_main" >&5 echo "${ECHO_T}$ac_cv_lib_Xpm_main" >&6 if test $ac_cv_lib_Xpm_main = yes; then cat >>confdefs.h <<EOF @@ -3843,7 +3847,7 @@ EOF LIBS="-lXpm $LIBS" else - { { echo "$as_me:3846: error: libXpm is missing from your system: Make sure you have both the Xpm libraries and development headers correctly installed" >&5 + { { echo "$as_me:3850: error: libXpm is missing from your system: Make sure you have both the Xpm libraries and development headers correctly installed" >&5 echo "$as_me: error: libXpm is missing from your system: Make sure you have both the Xpm libraries and development headers correctly installed" >&2;} { (exit 1); exit 1; }; } fi @@ -3851,13 +3855,13 @@ fi for ac_func in malloc setlocale strchr strdup strrchr strstr do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:3854: checking for $ac_func" >&5 +echo "$as_me:3858: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3860 "configure" +#line 3864 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -3888,16 +3892,16 @@ f = $ac_func; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3891: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3895: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3894: \$? = $ac_status" >&5 + echo "$as_me:3898: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3897: \"$ac_try\"") >&5 + { (eval echo "$as_me:3901: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3900: \$? = $ac_status" >&5 + echo "$as_me:3904: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -3907,7 +3911,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:3910: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3914: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -3926,20 +3930,6 @@ EOF fi; -echo "$as_me:3929: checking xfwm4 directory structure" >&5 -echo $ECHO_N "checking xfwm4 directory structure... $ECHO_C" >&6 -if test "x$prefix" = "xNONE"; -then - XFWM4_DIR="/usr/local/share/xfwm4" -elif test "x$datadir" = "x\${prefix}/share" -then - XFWM4_DIR="$prefix/share/xfwm4" -else - XFWM4_DIR="$datadir/xfwm4" -fi -echo "$as_me:3940: result: xfwm4 data dir set to $XFWM4_DIR" >&5 -echo "${ECHO_T}xfwm4 data dir set to $XFWM4_DIR" >&6 - ## Versions of dependencies GLIB_REQUIRED_VERSION=2.0.0 GTK_REQUIRED_VERSION=2.0.0 @@ -3950,7 +3940,7 @@ PANGO_REQUIRED_VERSION=1.0.0 if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:3953: checking for $ac_word" >&5 +echo "$as_me:3943: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3967,7 +3957,7 @@ for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if $as_executable_p "$ac_dir/$ac_word"; then ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - echo "$as_me:3970: found $ac_dir/$ac_word" >&5 + echo "$as_me:3960: found $ac_dir/$ac_word" >&5 break fi done @@ -3979,10 +3969,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$as_me:3982: result: $PKG_CONFIG" >&5 + echo "$as_me:3972: result: $PKG_CONFIG" >&5 echo "${ECHO_T}$PKG_CONFIG" >&6 else - echo "$as_me:3985: result: no" >&5 + echo "$as_me:3975: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -3996,24 +3986,24 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:3999: checking for glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION" >&5 + echo "$as_me:3989: checking for glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION" >&5 echo $ECHO_N "checking for glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION... $ECHO_C" >&6 if $PKG_CONFIG --exists "glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION" ; then - echo "$as_me:4003: result: yes" >&5 + echo "$as_me:3993: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes - echo "$as_me:4007: checking BASE_DEPENDENCIES_CFLAGS" >&5 + echo "$as_me:3997: checking BASE_DEPENDENCIES_CFLAGS" >&5 echo $ECHO_N "checking BASE_DEPENDENCIES_CFLAGS... $ECHO_C" >&6 BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION"` - echo "$as_me:4010: result: $BASE_DEPENDENCIES_CFLAGS" >&5 + echo "$as_me:4000: result: $BASE_DEPENDENCIES_CFLAGS" >&5 echo "${ECHO_T}$BASE_DEPENDENCIES_CFLAGS" >&6 - echo "$as_me:4013: checking BASE_DEPENDENCIES_LIBS" >&5 + echo "$as_me:4003: checking BASE_DEPENDENCIES_LIBS" >&5 echo $ECHO_N "checking BASE_DEPENDENCIES_LIBS... $ECHO_C" >&6 BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION"` - echo "$as_me:4016: result: $BASE_DEPENDENCIES_LIBS" >&5 + echo "$as_me:4006: result: $BASE_DEPENDENCIES_LIBS" >&5 echo "${ECHO_T}$BASE_DEPENDENCIES_LIBS" >&6 else BASE_DEPENDENCIES_CFLAGS="" @@ -4033,15 +4023,12 @@ echo "${ECHO_T}$BASE_DEPENDENCIES_LIBS" >&6 if test $succeeded = yes; then : else - { { echo "$as_me:4036: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 + { { echo "$as_me:4026: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 echo "$as_me: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} { (exit 1); exit 1; }; } fi -sed -e "s%XFWM4_DIR%$XFWM4_DIR%g" example.xfwm4rc.in > example.xfwm4rc -sed -e "s%XFWM4_DIR%$XFWM4_DIR%g" defaults/defaults.in > defaults/defaults - -ac_config_files="$ac_config_files Makefile src/Makefile defaults/Makefile themes/Makefile themes/agua/Makefile themes/coldsteel/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/gtk/Makefile themes/kde/Makefile themes/linea/Makefile themes/mofit/Makefile themes/next/Makefile themes/oroborus/Makefile themes/platinum/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/slimline/Makefile themes/trench/Makefile themes/xfce/Makefile" +ac_config_files="$ac_config_files xfwm4.spec Makefile src/Makefile defaults/Makefile themes/Makefile themes/agua/Makefile themes/coldsteel/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/gtk/Makefile themes/kde/Makefile themes/linea/Makefile themes/mofit/Makefile themes/next/Makefile themes/oroborus/Makefile themes/platinum/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/slimline/Makefile themes/trench/Makefile themes/xfce/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4121,7 +4108,7 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:4124: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:4111: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -4297,7 +4284,7 @@ cat >>$CONFIG_STATUS <<\EOF echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:4300: error: ambiguous option: $1 + { { echo "$as_me:4287: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -4316,7 +4303,7 @@ Try \`$0 --help' for more information." >&2;} ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:4319: error: unrecognized option: $1 + -*) { { echo "$as_me:4306: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -4358,6 +4345,7 @@ for ac_config_target in $ac_config_targets do case "$ac_config_target" in # Handling of arguments. + "xfwm4.spec" ) CONFIG_FILES="$CONFIG_FILES xfwm4.spec" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "defaults/Makefile" ) CONFIG_FILES="$CONFIG_FILES defaults/Makefile" ;; @@ -4380,7 +4368,7 @@ do "themes/xfce/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/xfce/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:4383: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:4371: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4485,7 +4473,6 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t s,@X_LIBS@,$X_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@XFWM4_DIR@,$XFWM4_DIR,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@BASE_DEPENDENCIES_CFLAGS@,$BASE_DEPENDENCIES_CFLAGS,;t t s,@BASE_DEPENDENCIES_LIBS@,$BASE_DEPENDENCIES_LIBS,;t t @@ -4603,7 +4590,7 @@ done; } esac if test x"$ac_file" != x-; then - { echo "$as_me:4606: creating $ac_file" >&5 + { echo "$as_me:4593: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -4621,7 +4608,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4624: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4611: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4634,7 +4621,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4637: error: cannot find input file: $f" >&5 + { { echo "$as_me:4624: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4695,7 +4682,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4698: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:4685: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4706,7 +4693,7 @@ echo "$as_me: creating $ac_file" >&6;} -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4709: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4696: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4719,7 +4706,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;} echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4722: error: cannot find input file: $f" >&5 + { { echo "$as_me:4709: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4836,7 +4823,7 @@ cat >>$CONFIG_STATUS <<\EOF rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:4839: $ac_file is unchanged" >&5 + { echo "$as_me:4826: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ diff --git a/configure.in b/configure.in index 97fac007a..99cd488c6 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,13 @@ AC_INIT(src/main.c) -AM_INIT_AUTOMAKE(xfwm4, 0.0.100) + +VERSION=`date +%y%m%d` +AM_INIT_AUTOMAKE(xfwm4, $VERSION) AM_CONFIG_HEADER(config.h) + +# Honor aclocal flags +ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + AC_PROG_CC AC_PROG_INSTALL @@ -20,20 +26,6 @@ AC_CHECK_FUNCS(malloc setlocale strchr strdup strrchr strstr) AC_ARG_ENABLE(debug, [ --enable-debug use this option if you want to debug xfwm4], [ AC_DEFINE(DEBUG, 1) ],) -dnl The following is to ensure $prefix is properly expanded -AC_MSG_CHECKING(xfwm4 directory structure) -if test "x$prefix" = "xNONE"; -then - XFWM4_DIR="/usr/local/share/xfwm4" -elif test "x$datadir" = "x\${prefix}/share" -then - XFWM4_DIR="$prefix/share/xfwm4" -else - XFWM4_DIR="$datadir/xfwm4" -fi -AC_MSG_RESULT(xfwm4 data dir set to $XFWM4_DIR) -AC_SUBST(XFWM4_DIR) - ## Versions of dependencies GLIB_REQUIRED_VERSION=2.0.0 GTK_REQUIRED_VERSION=2.0.0 @@ -41,10 +33,8 @@ PANGO_REQUIRED_VERSION=1.0.0 PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) -sed -e "s%XFWM4_DIR%$XFWM4_DIR%g" example.xfwm4rc.in > example.xfwm4rc -sed -e "s%XFWM4_DIR%$XFWM4_DIR%g" defaults/defaults.in > defaults/defaults - AC_OUTPUT([ +xfwm4.spec Makefile src/Makefile defaults/Makefile diff --git a/defaults/Makefile.am b/defaults/Makefile.am index 1a2a3dfc6..4db1fbcf4 100644 --- a/defaults/Makefile.am +++ b/defaults/Makefile.am @@ -1,5 +1,8 @@ -defaultsdir = $(XFWM4_DIR) +defaultsdir = $(pkgdatadir) defaults_DATA = defaults +EXTRA_DIST = defaults.in distclean-local: rm -f defaults +defaults : + @sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" defaults.in > defaults diff --git a/defaults/Makefile.in b/defaults/Makefile.in index 52841ab28..08c972665 100644 --- a/defaults/Makefile.in +++ b/defaults/Makefile.in @@ -62,10 +62,10 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -defaultsdir = $(XFWM4_DIR) +defaultsdir = $(pkgdatadir) defaults_DATA = defaults +EXTRA_DIST = defaults.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -189,6 +189,8 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean distclean-local: rm -f defaults +defaults : + @sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" defaults.in > defaults # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/defaults/defaults.in b/defaults/defaults.in index 39dcb6f91..fc5768d42 100644 --- a/defaults/defaults.in +++ b/defaults/defaults.in @@ -1,4 +1,4 @@ -theme=XFWM4_DIR/themes/kde +theme=_pkgdatadir_/themes/kde title_alignment=left full_width_title=true button_layout=OT|SHMC diff --git a/example.xfwm4rc.in b/example.xfwm4rc.in index a9e0c6a0b..6b8276c67 100644 --- a/example.xfwm4rc.in +++ b/example.xfwm4rc.in @@ -3,7 +3,7 @@ # You can use it as a template for your own configuration file # theme=directory -theme=XFWM4_DIR/themes/kde +theme=_pkgdatadir_/themes/kde # title_alignment=left/right/center title_alignment=left diff --git a/src/Makefile.am b/src/Makefile.am index de364640c..9a455fa46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(XFWM4_DIR)\" +CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(pkgdatadir)\" LIBS = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@ bin_PROGRAMS = xfwm4 diff --git a/src/Makefile.in b/src/Makefile.in index d386992cf..229a8cebf 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -62,13 +62,41 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(XFWM4_DIR)\" +CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(pkgdatadir)\" LIBS = @LIBS@ @X_LIBS@ @BASE_DEPENDENCIES_LIBS@ bin_PROGRAMS = xfwm4 -xfwm4_SOURCES = client.c events.c frame.c gtk_style.c gtktoxevent.c hints.c keyboard.c main.c menu.c misc.c parserc.c pixmap.c settings.c workspaces.c client.h debug.h events.h frame.h gtk_style.h gtktoxevent.h hints.h keyboard.h main.h menu.h misc.h parserc.h pixmap.h settings.h workspaces.h +xfwm4_SOURCES = \ + client.c \ + events.c \ + frame.c \ + gtk_style.c \ + gtktoxevent.c \ + hints.c \ + keyboard.c \ + main.c \ + menu.c \ + misc.c \ + parserc.c \ + pixmap.c \ + settings.c \ + workspaces.c \ + client.h \ + debug.h \ + events.h \ + frame.h \ + gtk_style.h \ + gtktoxevent.h \ + hints.h \ + keyboard.h \ + main.h \ + menu.h \ + misc.h \ + parserc.h \ + pixmap.h \ + settings.h \ + workspaces.h mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/themes/Makefile.in b/themes/Makefile.in index fa92f78cf..85ccfaea5 100644 --- a/themes/Makefile.in +++ b/themes/Makefile.in @@ -62,9 +62,24 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -SUBDIRS = agua coldsteel crux cruxish gtk kde linea mofit next oroborus platinum redmond redmondxp slimline trench xfce +SUBDIRS = \ +agua \ +coldsteel \ +crux \ +cruxish \ +gtk \ +kde \ +linea \ +mofit \ +next \ +oroborus \ +platinum \ +redmond \ +redmondxp \ +slimline \ +trench \ +xfce mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/themes/agua/Makefile.am b/themes/agua/Makefile.am index 253083a21..adaece8b5 100644 --- a/themes/agua/Makefile.am +++ b/themes/agua/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/agua +themedir = $(pkgdatadir)/themes/agua theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/agua/Makefile.in b/themes/agua/Makefile.in index bab2e354a..7e5c9679b 100644 --- a/themes/agua/Makefile.in +++ b/themes/agua/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/agua -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/agua +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/coldsteel/Makefile.am b/themes/coldsteel/Makefile.am index 37e290cae..05538dc01 100644 --- a/themes/coldsteel/Makefile.am +++ b/themes/coldsteel/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/coldsteel +themedir = $(pkgdatadir)/themes/coldsteel theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/coldsteel/Makefile.in b/themes/coldsteel/Makefile.in index c0712238b..b4d1d5ca6 100644 --- a/themes/coldsteel/Makefile.in +++ b/themes/coldsteel/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/coldsteel -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/coldsteel +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/crux/Makefile.am b/themes/crux/Makefile.am index 800fe1954..b2cca348e 100644 --- a/themes/crux/Makefile.am +++ b/themes/crux/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/crux +themedir = $(pkgdatadir)/themes/crux theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/crux/Makefile.in b/themes/crux/Makefile.in index 08e9352fd..75833077f 100644 --- a/themes/crux/Makefile.in +++ b/themes/crux/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/crux -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/crux +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/cruxish/Makefile.am b/themes/cruxish/Makefile.am index c7ccb7814..691d374df 100644 --- a/themes/cruxish/Makefile.am +++ b/themes/cruxish/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/cruxish +themedir = $(pkgdatadir)/themes/cruxish theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/cruxish/Makefile.in b/themes/cruxish/Makefile.in index 0b1e79083..ac9ea42a5 100644 --- a/themes/cruxish/Makefile.in +++ b/themes/cruxish/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/cruxish -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/cruxish +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/gtk/Makefile.am b/themes/gtk/Makefile.am index c3b908ef8..11d910035 100644 --- a/themes/gtk/Makefile.am +++ b/themes/gtk/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/gtk +themedir = $(pkgdatadir)/themes/gtk theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/gtk/Makefile.in b/themes/gtk/Makefile.in index 21f2a0504..e1b0f064a 100644 --- a/themes/gtk/Makefile.in +++ b/themes/gtk/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/gtk -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/gtk +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/kde/Makefile.am b/themes/kde/Makefile.am index 45fbb79a0..c68cc2dd5 100644 --- a/themes/kde/Makefile.am +++ b/themes/kde/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/kde +themedir = $(pkgdatadir)/themes/kde theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/kde/Makefile.in b/themes/kde/Makefile.in index c2c4e5f60..94534a19b 100644 --- a/themes/kde/Makefile.in +++ b/themes/kde/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/kde -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/kde +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/linea/Makefile.am b/themes/linea/Makefile.am index 4add04239..610d92550 100644 --- a/themes/linea/Makefile.am +++ b/themes/linea/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/linea +themedir = $(pkgdatadir)/themes/linea theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/linea/Makefile.in b/themes/linea/Makefile.in index d19944aac..002d780ba 100644 --- a/themes/linea/Makefile.in +++ b/themes/linea/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/linea -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/linea +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/mofit/Makefile.am b/themes/mofit/Makefile.am index 944ead265..957d697eb 100644 --- a/themes/mofit/Makefile.am +++ b/themes/mofit/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/mofit +themedir = $(pkgdatadir)/themes/mofit theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/mofit/Makefile.in b/themes/mofit/Makefile.in index 69a7eb621..0d353503c 100644 --- a/themes/mofit/Makefile.in +++ b/themes/mofit/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/mofit -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/mofit +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/next/Makefile.am b/themes/next/Makefile.am index 9cd3ea50c..afe1d574d 100644 --- a/themes/next/Makefile.am +++ b/themes/next/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/next +themedir = $(pkgdatadir)/themes/next theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/next/Makefile.in b/themes/next/Makefile.in index 9daead566..73b585e12 100644 --- a/themes/next/Makefile.in +++ b/themes/next/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/next -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/next +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/oroborus/Makefile.am b/themes/oroborus/Makefile.am index e0e6d4e48..b9835cdf2 100644 --- a/themes/oroborus/Makefile.am +++ b/themes/oroborus/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/oroborus +themedir = $(pkgdatadir)/themes/oroborus theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/oroborus/Makefile.in b/themes/oroborus/Makefile.in index 68e9211ec..1e43687b5 100644 --- a/themes/oroborus/Makefile.in +++ b/themes/oroborus/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/oroborus -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/oroborus +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/platinum/Makefile.am b/themes/platinum/Makefile.am index 4144de9ee..3f06a5ee2 100644 --- a/themes/platinum/Makefile.am +++ b/themes/platinum/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/platinum +themedir = $(pkgdatadir)/themes/platinum theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/platinum/Makefile.in b/themes/platinum/Makefile.in index 9f4748a83..7aac26242 100644 --- a/themes/platinum/Makefile.in +++ b/themes/platinum/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/platinum -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/platinum +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/redmond/Makefile.am b/themes/redmond/Makefile.am index 6994cf9f0..767f56c71 100644 --- a/themes/redmond/Makefile.am +++ b/themes/redmond/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/redmond +themedir = $(pkgdatadir)/themes/redmond theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/redmond/Makefile.in b/themes/redmond/Makefile.in index fab265ace..83f178b4b 100644 --- a/themes/redmond/Makefile.in +++ b/themes/redmond/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/redmond -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/redmond +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/redmondxp/Makefile.am b/themes/redmondxp/Makefile.am index 595c0d685..eeb25f6a8 100644 --- a/themes/redmondxp/Makefile.am +++ b/themes/redmondxp/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/redmondxp +themedir = $(pkgdatadir)/themes/redmondxp theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/redmondxp/Makefile.in b/themes/redmondxp/Makefile.in index 46378d84b..84e8663d3 100644 --- a/themes/redmondxp/Makefile.in +++ b/themes/redmondxp/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/redmondxp -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/redmondxp +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/slimline/Makefile.am b/themes/slimline/Makefile.am index 9f20d1edc..720f51279 100644 --- a/themes/slimline/Makefile.am +++ b/themes/slimline/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/slimline +themedir = $(pkgdatadir)/themes/slimline theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/slimline/Makefile.in b/themes/slimline/Makefile.in index a35e056d9..88e3ca71f 100644 --- a/themes/slimline/Makefile.in +++ b/themes/slimline/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/slimline -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/slimline +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/trench/Makefile.am b/themes/trench/Makefile.am index 11394b618..a308fe5d9 100644 --- a/themes/trench/Makefile.am +++ b/themes/trench/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/trench +themedir = $(pkgdatadir)/themes/trench theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/trench/Makefile.in b/themes/trench/Makefile.in index f10c1672c..56ce96d7f 100644 --- a/themes/trench/Makefile.in +++ b/themes/trench/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/trench -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/trench +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/themes/xfce/Makefile.am b/themes/xfce/Makefile.am index 6a433127f..ce45c89a9 100644 --- a/themes/xfce/Makefile.am +++ b/themes/xfce/Makefile.am @@ -1,4 +1,4 @@ -themedir = $(XFWM4_DIR)/themes/xfce +themedir = $(pkgdatadir)/themes/xfce theme_DATA = bottom-active.xpm \ bottom-inactive.xpm \ bottom-left-active.xpm \ diff --git a/themes/xfce/Makefile.in b/themes/xfce/Makefile.in index b57024560..ffba6e56c 100644 --- a/themes/xfce/Makefile.in +++ b/themes/xfce/Makefile.in @@ -62,10 +62,51 @@ MAKEINFO = @MAKEINFO@ PACKAGE = @PACKAGE@ PKG_CONFIG = @PKG_CONFIG@ VERSION = @VERSION@ -XFWM4_DIR = @XFWM4_DIR@ -themedir = $(XFWM4_DIR)/themes/xfce -theme_DATA = bottom-active.xpm bottom-inactive.xpm bottom-left-active.xpm bottom-left-inactive.xpm bottom-right-active.xpm bottom-right-inactive.xpm close-active.xpm close-inactive.xpm close-pressed.xpm hide-active.xpm hide-inactive.xpm hide-pressed.xpm left-active.xpm left-inactive.xpm maximize-active.xpm maximize-inactive.xpm maximize-pressed.xpm menu-active.xpm menu-inactive.xpm menu-pressed.xpm right-active.xpm right-inactive.xpm shade-active.xpm shade-inactive.xpm shade-pressed.xpm stick-active.xpm stick-inactive.xpm stick-pressed.xpm themerc title-1-active.xpm title-1-inactive.xpm title-2-active.xpm title-2-inactive.xpm title-3-active.xpm title-3-inactive.xpm title-4-active.xpm title-4-inactive.xpm title-5-active.xpm title-5-inactive.xpm top-left-active.xpm top-left-inactive.xpm top-right-active.xpm top-right-inactive.xpm +themedir = $(pkgdatadir)/themes/xfce +theme_DATA = bottom-active.xpm \ + bottom-inactive.xpm \ + bottom-left-active.xpm \ + bottom-left-inactive.xpm \ + bottom-right-active.xpm \ + bottom-right-inactive.xpm \ + close-active.xpm \ + close-inactive.xpm \ + close-pressed.xpm \ + hide-active.xpm \ + hide-inactive.xpm \ + hide-pressed.xpm \ + left-active.xpm \ + left-inactive.xpm \ + maximize-active.xpm \ + maximize-inactive.xpm \ + maximize-pressed.xpm \ + menu-active.xpm \ + menu-inactive.xpm \ + menu-pressed.xpm \ + right-active.xpm \ + right-inactive.xpm \ + shade-active.xpm \ + shade-inactive.xpm \ + shade-pressed.xpm \ + stick-active.xpm \ + stick-inactive.xpm \ + stick-pressed.xpm \ + themerc \ + title-1-active.xpm \ + title-1-inactive.xpm \ + title-2-active.xpm \ + title-2-inactive.xpm \ + title-3-active.xpm \ + title-3-inactive.xpm \ + title-4-active.xpm \ + title-4-inactive.xpm \ + title-5-active.xpm \ + title-5-inactive.xpm \ + top-left-active.xpm \ + top-left-inactive.xpm \ + top-right-active.xpm \ + top-right-inactive.xpm EXTRA_DIST = $(theme_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/xfwm4.spec b/xfwm4.spec deleted file mode 100644 index 6a9aaf322..000000000 --- a/xfwm4.spec +++ /dev/null @@ -1,38 +0,0 @@ -Summary: xfwm4, next generation window manager for xfce -Name: xfwm4 -Version: 0.1.0 -Release: 1 -URL: http://people.redhat.com/~hp/metacity/ -Source0: %{name}-%{version}.tar.gz -License: GPL -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: gtk2-devel >= 2.0.0 -BuildRequires: glib2-devel >= 2.0.0 -BuildRequires: pango-devel >= 1.0.0 - -%description - -Xfwm4 is a window manager compatable with GNOME, GNOME2, KDE2, KDE3 and Xfce. - -%prep -%setup -q - -%build -%configure -make - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc example.xfwm4rc example.gtkrc-2.0 README -%{_bindir}/* -%{_datadir}/xfwm4 - - diff --git a/xfwm4.spec.in b/xfwm4.spec.in new file mode 100644 index 000000000..97f70c8a0 --- /dev/null +++ b/xfwm4.spec.in @@ -0,0 +1,37 @@ +Summary: Next generation window manager for xfce +Name: xfwm4 +Version: @VERSION@ +Release: 1 +License: GPL +URL: http://www.xfce.org/ +Source0: %{name}-%{version}.tar.gz +Group: User Interface/Desktops +BuildRoot: %{_tmppath}/%{name}-root +BuildRequires: gtk2-devel >= 2.0.0 +BuildRequires: glib2-devel >= 2.0.0 +BuildRequires: pango-devel >= 1.0.0 + +%description +xfwm4 is a window manager compatable with GNOME, GNOME2, KDE2, KDE3 and Xfce. + +%prep +%setup -q + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc example.xfwm4rc example.gtkrc-2.0 README INSTALL TODO COPYING AUTHORS +%{_bindir}/* +%{_datadir}/xfwm4 + + |