diff --git a/Makefile.in b/Makefile.in index 77602aa52..c8069eba4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,6 +96,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ diff --git a/configure b/configure index cd2bb157b..da8885ffd 100755 --- a/configure +++ b/configure @@ -883,6 +883,7 @@ F77 FFLAGS ac_ct_F77 LIBTOOL +XMKMF GETTEXT_PACKAGE USE_NLS MSGFMT @@ -899,7 +900,6 @@ PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS -XMKMF PKG_CONFIG DBUS_CFLAGS DBUS_LIBS @@ -908,6 +908,8 @@ PYGTK_LIBS PYGTK_DEFS GTKSPELL_CFLAGS GTKSPELL_LIBS +BUILD_GTKSPELL_TRUE +BUILD_GTKSPELL_FALSE XSCRNSAVER_CFLAGS XSCRNSAVER_LIBS PYTHON @@ -1539,6 +1541,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) + --enable-gtkspell build spell checking support default auto Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -5888,7 +5891,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5891 "configure"' > conftest.$ac_ext + echo '#line 5894 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8913,11 +8916,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8916: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8919: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8920: \$? = $ac_status" >&5 + echo "$as_me:8923: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9181,11 +9184,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9184: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9187: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9188: \$? = $ac_status" >&5 + echo "$as_me:9191: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9285,11 +9288,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9288: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9291: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9292: \$? = $ac_status" >&5 + echo "$as_me:9295: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11774,7 +11777,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:14248: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14249: \$? = $ac_status" >&5 + echo "$as_me:14252: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14346,11 +14349,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14349: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14352: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14353: \$? = $ac_status" >&5 + echo "$as_me:14356: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15953,11 +15956,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15956: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15959: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15960: \$? = $ac_status" >&5 + echo "$as_me:15963: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16057,11 +16060,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16060: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16063: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16064: \$? = $ac_status" >&5 + echo "$as_me:16067: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18324,11 +18327,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18327: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18330: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18331: \$? = $ac_status" >&5 + echo "$as_me:18334: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18592,11 +18595,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18595: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18598: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18599: \$? = $ac_status" >&5 + echo "$as_me:18602: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18696,11 +18699,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18699: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18702: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18703: \$? = $ac_status" >&5 + echo "$as_me:18706: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -21427,6 +21430,268 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } + + +# Check whether --with-x was given. +if test "${with_x+set}" = set; then + withval=$with_x; +fi + +# $have_x is `yes', `no', `disabled', or empty when we do not yet know. +if test "x$with_x" = xno; then + # The user explicitly disabled X. + have_x=disabled +else + case $x_includes,$x_libraries in #( + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # One or both of the vars are not set, and there is no cached value. +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then + ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac + case $ac_im_usrlibdir in + /usr/lib | /lib) ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. + rm -f -r conftest.dir +fi + +# Standard set of common directories for X headers. +# Check X11 before X11Rn because it is often a symlink to the current release. +ac_x_header_dirs=' +/usr/X11/include +/usr/X11R6/include +/usr/X11R5/include +/usr/X11R4/include + +/usr/include/X11 +/usr/include/X11R6 +/usr/include/X11R5 +/usr/include/X11R4 + +/usr/local/X11/include +/usr/local/X11R6/include +/usr/local/X11R5/include +/usr/local/X11R4/include + +/usr/local/include/X11 +/usr/local/include/X11R6 +/usr/local/include/X11R5 +/usr/local/include/X11R4 + +/usr/X386/include +/usr/x386/include +/usr/XFree86/include/X11 + +/usr/include +/usr/local/include +/usr/unsupported/include +/usr/athena/include +/usr/local/x11r5/include +/usr/lpp/Xamples/include + +/usr/openwin/include +/usr/openwin/share/include' + +if test "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. + # First, try using that file with no special directory specified. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + # We can compile using X headers with no special include directory. +ac_x_includes= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +done +fi + +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no + +if test "$ac_x_libraries" = no; then + # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. + ac_save_LIBS=$LIBS + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + LIBS=$ac_save_LIBS +# We can link X programs with no special library path. +ac_x_libraries= +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +do + # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do + if test -r "$ac_dir/libXt.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done +done +fi + +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi # $ac_x_libraries = no + +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac +fi +;; #( + *) have_x=yes;; + esac + eval "$ac_cv_have_x" +fi # $with_x != no + +if test "$have_x" != yes; then + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } + no_x=yes +else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # 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:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } +fi + GETTEXT_PACKAGE=gajim @@ -23190,269 +23455,6 @@ echo "${ECHO_T}$LINGUAS" >&6; } < $srcdir/po/POTFILES.in > po/POTFILES -{ echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6; } - - -# Check whether --with-x was given. -if test "${with_x+set}" = set; then - withval=$with_x; -fi - -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - case $x_includes,$x_libraries in #( - *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 -echo "$as_me: error: Cannot use X directory names containing '" >&2;} - { (exit 1); exit 1; }; };; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ac_x_includes= ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -f -r conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi - -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XrmInitialize () - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -do - # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl; do - if test -r "$ac_dir/libXt.$ac_extension"; then - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac -fi -;; #( - *) have_x=yes;; - esac - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - { echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6; } - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # 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:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } -fi - - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -23803,8 +23805,28 @@ fi PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` +# Check whether --enable-gtkspell was given. +if test "${enable_gtkspell+set}" = set; then + enableval=$enable_gtkspell; +else + enable_gtkspell=auto +fi +if test "x$enable_gtkspell" = "xauto";then + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtkspell-2.0\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtkspell-2.0") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + enable_gtkspell=yes +else + enable_gtkspell=no +fi +fi +if test "x$enable_gtkspell" = "xyes";then + pkg_failed=no { echo "$as_me:$LINENO: checking for GTKSPELL" >&5 echo $ECHO_N "checking for GTKSPELL... $ECHO_C" >&6; } @@ -23917,8 +23939,34 @@ echo "${ECHO_T}yes" >&6; } fi + have_gtkspell=true +else + have_gtkspell=false +fi +if $have_gtkspell; then + BUILD_GTKSPELL_TRUE= + BUILD_GTKSPELL_FALSE='#' +else + BUILD_GTKSPELL_TRUE='#' + BUILD_GTKSPELL_FALSE= +fi + + +if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xscrnsaver\"") >&5 + ($PKG_CONFIG --exists --print-errors "xscrnsaver") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + have_xscrnsaver=yes +else + have_xscrnsaver=no +fi + +if test "x$have_xscrnsaver" = "xyes";then + pkg_failed=no { echo "$as_me:$LINENO: checking for XSCRNSAVER" >&5 echo $ECHO_N "checking for XSCRNSAVER... $ECHO_C" >&6; } @@ -24030,12 +24078,12 @@ echo "${ECHO_T}yes" >&6; } : fi -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lX11': +else + # Checks for libraries. -{ echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; } +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24047,11 +24095,17 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XOpenDisplay (); int main () { -return main (); +return XOpenDisplay (); ; return 0; } @@ -24090,21 +24144,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_X11_main=yes + ac_cv_lib_X11_XOpenDisplay=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_X11_main=no + ac_cv_lib_X11_XOpenDisplay=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: 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 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; } +if test $ac_cv_lib_X11_XOpenDisplay = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBX11 1 _ACEOF @@ -24113,11 +24167,10 @@ _ACEOF fi -# FIXME: Replace `main' with a function in `-lXext': -{ echo "$as_me:$LINENO: 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 "$as_me:$LINENO: checking for XMissingExtension in -lXext" >&5 +echo $ECHO_N "checking for XMissingExtension in -lXext... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xext_XMissingExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24129,11 +24182,17 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XMissingExtension (); int main () { -return main (); +return XMissingExtension (); ; return 0; } @@ -24172,21 +24231,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xext_main=yes + ac_cv_lib_Xext_XMissingExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xext_main=no + ac_cv_lib_Xext_XMissingExtension=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: 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 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XMissingExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XMissingExtension" >&6; } +if test $ac_cv_lib_Xext_XMissingExtension = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXEXT 1 _ACEOF @@ -24195,11 +24254,10 @@ _ACEOF fi -# FIXME: Replace `main' with a function in `-lXss': -{ echo "$as_me:$LINENO: checking for main in -lXss" >&5 -echo $ECHO_N "checking for main in -lXss... $ECHO_C" >&6; } -if test "${ac_cv_lib_Xss_main+set}" = set; then +{ echo "$as_me:$LINENO: checking for XScreenSaverAllocInfo in -lXss" >&5 +echo $ECHO_N "checking for XScreenSaverAllocInfo in -lXss... $ECHO_C" >&6; } +if test "${ac_cv_lib_Xss_XScreenSaverAllocInfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24211,11 +24269,17 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XScreenSaverAllocInfo (); int main () { -return main (); +return XScreenSaverAllocInfo (); ; return 0; } @@ -24254,21 +24318,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_Xss_main=yes + ac_cv_lib_Xss_XScreenSaverAllocInfo=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_Xss_main=no + ac_cv_lib_Xss_XScreenSaverAllocInfo=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Xss_main" >&6; } -if test $ac_cv_lib_Xss_main = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverAllocInfo" >&5 +echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverAllocInfo" >&6; } +if test $ac_cv_lib_Xss_XScreenSaverAllocInfo = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXSS 1 _ACEOF @@ -24277,6 +24341,9 @@ _ACEOF fi + XSCRNSAVER_LIBS=" -lX11 -lXss -lXext" + +fi @@ -24533,7 +24600,6 @@ CPPFLAGS="$save_CPPFLAGS" - ac_config_files="$ac_config_files Makefile data/Makefile data/glade/Makefile data/emoticons/Makefile data/pixmaps/Makefile data/iconsets/Makefile data/gajim.desktop.in src/Makefile src/common/Makefile scripts/gajim po/Makefile.in" cat >confcache <<\_ACEOF @@ -24671,6 +24737,13 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BUILD_GTKSPELL_TRUE}" && test -z "${BUILD_GTKSPELL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_GTKSPELL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_GTKSPELL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -25379,6 +25452,7 @@ F77!$F77$ac_delim FFLAGS!$FFLAGS$ac_delim ac_ct_F77!$ac_ct_F77$ac_delim LIBTOOL!$LIBTOOL$ac_delim +XMKMF!$XMKMF$ac_delim GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim USE_NLS!$USE_NLS$ac_delim MSGFMT!$MSGFMT$ac_delim @@ -25395,7 +25469,6 @@ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim POFILES!$POFILES$ac_delim POSUB!$POSUB$ac_delim MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim -XMKMF!$XMKMF$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim DBUS_LIBS!$DBUS_LIBS$ac_delim @@ -25404,6 +25477,8 @@ PYGTK_LIBS!$PYGTK_LIBS$ac_delim PYGTK_DEFS!$PYGTK_DEFS$ac_delim GTKSPELL_CFLAGS!$GTKSPELL_CFLAGS$ac_delim GTKSPELL_LIBS!$GTKSPELL_LIBS$ac_delim +BUILD_GTKSPELL_TRUE!$BUILD_GTKSPELL_TRUE$ac_delim +BUILD_GTKSPELL_FALSE!$BUILD_GTKSPELL_FALSE$ac_delim XSCRNSAVER_CFLAGS!$XSCRNSAVER_CFLAGS$ac_delim XSCRNSAVER_LIBS!$XSCRNSAVER_LIBS$ac_delim PYTHON!$PYTHON$ac_delim @@ -25420,7 +25495,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 72; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 9fc4d3a17..1d7805662 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,7 @@ AC_PROG_CC AC_PROG_INSTALL AC_PROG_MAKE_SET AC_PROG_LIBTOOL +AC_PATH_X GETTEXT_PACKAGE=gajim AC_SUBST([GETTEXT_PACKAGE]) @@ -23,8 +24,6 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"], [Gettext package]) ALL_LINGUAS="fr pt el pl es ru bg de nb cs nl pt_BR sv it eu sk no zh_CN br eo" AM_GLIB_GNU_GETTEXT -AC_PATH_X - PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.61 dbus-glib-1 >= 0.61]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -35,21 +34,36 @@ AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` AC_SUBST(PYGTK_DEFS) +AC_ARG_ENABLE(gtkspell, + [ --enable-gtkspell build spell checking support [default auto]],, + enable_gtkspell=auto) -PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0]) -AC_SUBST(GTKSPELL_CFLAGS) -AC_SUBST(GTKSPELL_LIBS) +if test "x$enable_gtkspell" = "xauto";then + PKG_CHECK_EXISTS([gtkspell-2.0], [enable_gtkspell=yes], [enable_gtkspell=no]) +fi +if test "x$enable_gtkspell" = "xyes";then + PKG_CHECK_MODULES([GTKSPELL], [gtkspell-2.0]) + AC_SUBST(GTKSPELL_CFLAGS) + AC_SUBST(GTKSPELL_LIBS) + have_gtkspell=true +else + have_gtkspell=false +fi +AM_CONDITIONAL(BUILD_GTKSPELL, $have_gtkspell) -PKG_CHECK_MODULES([XSCRNSAVER], xscrnsaver) -dnl AC_SUBST(XSCRNSAVER_LIBS) +PKG_CHECK_EXISTS([xscrnsaver], [have_xscrnsaver=yes], [have_xscrnsaver=no]) -# Checks for libraries. -# FIXME: Replace `main' with a function in `-lX11': -AC_CHECK_LIB([X11], [main]) -# FIXME: Replace `main' with a function in `-lXext': -AC_CHECK_LIB([Xext], [main]) -# FIXME: Replace `main' with a function in `-lXss': -AC_CHECK_LIB([Xss], [main]) +if test "x$have_xscrnsaver" = "xyes";then + PKG_CHECK_MODULES([XSCRNSAVER], xscrnsaver) + AC_SUBST(XSCRNSAVER_LIBS) +else + # Checks for libraries. + AC_CHECK_LIB([X11], [XOpenDisplay]) + AC_CHECK_LIB([Xext], [XMissingExtension]) + AC_CHECK_LIB([Xss], [XScreenSaverAllocInfo]) + XSCRNSAVER_LIBS=" -lX11 -lXss -lXext" + AC_SUBST([XSCRNSAVER_LIBS]) +fi AM_PATH_PYTHON([2.4]) @@ -58,8 +72,7 @@ if test "x$PYTHON" = "x:"; then fi AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) - - +AC_SUBST([PYTHON_INCLUDES]) AC_CONFIG_FILES([ Makefile diff --git a/data/Makefile.in b/data/Makefile.in index 4325f55ba..bb11e75e0 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -84,6 +84,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ diff --git a/data/emoticons/Makefile.am b/data/emoticons/Makefile.am index e7d867243..463c36e5a 100644 --- a/data/emoticons/Makefile.am +++ b/data/emoticons/Makefile.am @@ -6,18 +6,18 @@ EMOTICONS_DIRS = ** EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py} -# copy files recursively + install-data-local: @for d in $(EMOTICONS_DIRS);do \ if test -d $$d;then \ - echo " $(mkinstalldirs) $(pkgdatadir)/data/emoticons/$$d"; \ - $(mkinstalldirs) $(pkgdatadir)/data/emoticons/$$d || exit 1; \ + echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \ fi; \ done; \ for f in $(EMOTICONS_FILES);do \ if test -f $$f; then \ - echo " $(INSTALL_DATA) $$f $(pkgdatadir)/data/emoticons/$$f"; \ - $(INSTALL_DATA) $$f $(pkgdatadir)/data/emoticons/$$f || exit 1; \ + echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \ fi; \ done; diff --git a/data/emoticons/Makefile.in b/data/emoticons/Makefile.in index 56630453a..e3de48d31 100644 --- a/data/emoticons/Makefile.in +++ b/data/emoticons/Makefile.in @@ -68,6 +68,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -415,18 +417,17 @@ uninstall-am: uninstall-emoticonsDATA uninstall-info-am uninstall-emoticonsDATA uninstall-info-am -# copy files recursively install-data-local: @for d in $(EMOTICONS_DIRS);do \ if test -d $$d;then \ - echo " $(mkinstalldirs) $(pkgdatadir)/data/emoticons/$$d"; \ - $(mkinstalldirs) $(pkgdatadir)/data/emoticons/$$d || exit 1; \ + echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \ fi; \ done; \ for f in $(EMOTICONS_FILES);do \ if test -f $$f; then \ - echo " $(INSTALL_DATA) $$f $(pkgdatadir)/data/emoticons/$$f"; \ - $(INSTALL_DATA) $$f $(pkgdatadir)/data/emoticons/$$f || exit 1; \ + echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \ fi; \ done; diff --git a/data/glade/Makefile.in b/data/glade/Makefile.in index 5733be2ac..bc613093a 100644 --- a/data/glade/Makefile.in +++ b/data/glade/Makefile.in @@ -68,6 +68,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ diff --git a/data/iconsets/Makefile.am b/data/iconsets/Makefile.am index ce3281cda..547b110b8 100644 --- a/data/iconsets/Makefile.am +++ b/data/iconsets/Makefile.am @@ -11,14 +11,14 @@ ICONSET_FILES = **/{16x16,32x32,48x48}/{*.gif,*.png} \ install-data-local: @for d in $(ICONSET_DIRS);do \ if test -d $$d;then \ - echo " $(mkinstalldirs) $(pkgdatadir)/data/iconsets/$$d"; \ - $(mkinstalldirs) $(pkgdatadir)/data/iconsets/$$d || exit 1; \ + echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \ fi; \ done for f in $(ICONSET_FILES);do \ if test -f $$f; then \ - echo " $(INSTALL_DATA) $$f $(pkgdatadir)/data/iconsets/$$f"; \ - $(INSTALL_DATA) $$f $(pkgdatadir)/data/iconsets/$$f || exit 1; \ + echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \ fi; \ done; diff --git a/data/iconsets/Makefile.in b/data/iconsets/Makefile.in index 2156cb61a..ec04cccd2 100644 --- a/data/iconsets/Makefile.in +++ b/data/iconsets/Makefile.in @@ -68,6 +68,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -422,14 +424,14 @@ uninstall-am: uninstall-iconsetDATA uninstall-info-am install-data-local: @for d in $(ICONSET_DIRS);do \ if test -d $$d;then \ - echo " $(mkinstalldirs) $(pkgdatadir)/data/iconsets/$$d"; \ - $(mkinstalldirs) $(pkgdatadir)/data/iconsets/$$d || exit 1; \ + echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \ fi; \ done for f in $(ICONSET_FILES);do \ if test -f $$f; then \ - echo " $(INSTALL_DATA) $$f $(pkgdatadir)/data/iconsets/$$f"; \ - $(INSTALL_DATA) $$f $(pkgdatadir)/data/iconsets/$$f || exit 1; \ + echo " $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \ fi; \ done; diff --git a/data/pixmaps/Makefile.in b/data/pixmaps/Makefile.in index ccb40a98b..2037fd50a 100644 --- a/data/pixmaps/Makefile.in +++ b/data/pixmaps/Makefile.in @@ -68,6 +68,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ diff --git a/src/Makefile.am b/src/Makefile.am index 8b780770c..608409f1a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,6 +5,7 @@ CLEANFILES = \ INCLUDES = \ $(PYTHON_INCLUDES) +if BUILD_GTKSPELL gtkspelllib_LTLIBRARIES = gtkspell.la gtkspelllibdir = $(libdir)/gajim @@ -15,9 +16,10 @@ gtkspell_la_SOURCES = \ gtkspellmodule.c gtkspell_la_LDFLAGS = \ - -module -avoid-version -no-undefined + -module -avoid-version gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS) +endif trayiconlib_LTLIBRARIES = trayicon.la trayiconlibdir = $(libdir)/gajim @@ -28,7 +30,7 @@ trayicon_la_SOURCES = \ nodist_trayicon_la_SOURCES = \ trayicon.c trayicon_la_LDFLAGS = \ - -module -avoid-version -no-undefined + -module -avoid-version trayicon_la_CFLAGS = $(PYGTK_CFLAGS) trayicon.c: trayicon.defs trayicon.override diff --git a/src/Makefile.in b/src/Makefile.in index 485304e88..3dd32bf57 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -61,9 +61,13 @@ gtkspelllibLTLIBRARIES_INSTALL = $(INSTALL) trayiconlibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(gtkspelllib_LTLIBRARIES) $(trayiconlib_LTLIBRARIES) am__DEPENDENCIES_1 = -gtkspell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_gtkspell_la_OBJECTS = gtkspell_la-gtkspellmodule.lo +@BUILD_GTKSPELL_TRUE@gtkspell_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@BUILD_GTKSPELL_TRUE@ $(am__DEPENDENCIES_1) +am__gtkspell_la_SOURCES_DIST = gtkspellmodule.c +@BUILD_GTKSPELL_TRUE@am_gtkspell_la_OBJECTS = \ +@BUILD_GTKSPELL_TRUE@ gtkspell_la-gtkspellmodule.lo gtkspell_la_OBJECTS = $(am_gtkspell_la_OBJECTS) +@BUILD_GTKSPELL_TRUE@am_gtkspell_la_rpath = -rpath $(gtkspelllibdir) trayicon_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_trayicon_la_OBJECTS = trayicon_la-eggtrayicon.lo \ trayicon_la-trayiconmodule.lo @@ -83,7 +87,7 @@ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(gtkspell_la_SOURCES) $(trayicon_la_SOURCES) \ $(nodist_trayicon_la_SOURCES) -DIST_SOURCES = $(gtkspell_la_SOURCES) $(trayicon_la_SOURCES) +DIST_SOURCES = $(am__gtkspell_la_SOURCES_DIST) $(trayicon_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-exec-recursive install-info-recursive \ @@ -110,6 +114,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -275,18 +281,18 @@ CLEANFILES = \ INCLUDES = \ $(PYTHON_INCLUDES) -gtkspelllib_LTLIBRARIES = gtkspell.la -gtkspelllibdir = $(libdir)/gajim -gtkspell_la_LIBADD = \ - $(GTKSPELL_LIBS) $(PYGTK_LIBS) +@BUILD_GTKSPELL_TRUE@gtkspelllib_LTLIBRARIES = gtkspell.la +@BUILD_GTKSPELL_TRUE@gtkspelllibdir = $(libdir)/gajim +@BUILD_GTKSPELL_TRUE@gtkspell_la_LIBADD = \ +@BUILD_GTKSPELL_TRUE@ $(GTKSPELL_LIBS) $(PYGTK_LIBS) -gtkspell_la_SOURCES = \ - gtkspellmodule.c +@BUILD_GTKSPELL_TRUE@gtkspell_la_SOURCES = \ +@BUILD_GTKSPELL_TRUE@ gtkspellmodule.c -gtkspell_la_LDFLAGS = \ - -module -avoid-version -no-undefined +@BUILD_GTKSPELL_TRUE@gtkspell_la_LDFLAGS = \ +@BUILD_GTKSPELL_TRUE@ -module -avoid-version -gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS) +@BUILD_GTKSPELL_TRUE@gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS) trayiconlib_LTLIBRARIES = trayicon.la trayiconlibdir = $(libdir)/gajim trayicon_la_LIBADD = $(PYGTK_LIBS) @@ -298,7 +304,7 @@ nodist_trayicon_la_SOURCES = \ trayicon.c trayicon_la_LDFLAGS = \ - -module -avoid-version -no-undefined + -module -avoid-version trayicon_la_CFLAGS = $(PYGTK_CFLAGS) gajimsrcdir = $(pkgdatadir)/src @@ -414,7 +420,7 @@ clean-trayiconlibLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done gtkspell.la: $(gtkspell_la_OBJECTS) $(gtkspell_la_DEPENDENCIES) - $(LINK) -rpath $(gtkspelllibdir) $(gtkspell_la_LDFLAGS) $(gtkspell_la_OBJECTS) $(gtkspell_la_LIBADD) $(LIBS) + $(LINK) $(am_gtkspell_la_rpath) $(gtkspell_la_LDFLAGS) $(gtkspell_la_OBJECTS) $(gtkspell_la_LIBADD) $(LIBS) trayicon.la: $(trayicon_la_OBJECTS) $(trayicon_la_DEPENDENCIES) $(LINK) -rpath $(trayiconlibdir) $(trayicon_la_LDFLAGS) $(trayicon_la_OBJECTS) $(trayicon_la_LIBADD) $(LIBS) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 22d2fd827..0b28a0f42 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -1,11 +1,7 @@ -#CLEANFILES = \ -# trayicon.c - INCLUDES = \ $(PYTHON_INCLUDES) - idlelib_LTLIBRARIES = idle.la idlelibdir = $(libdir)/gajim @@ -14,7 +10,7 @@ idle_la_LIBADD = $(XSCREENSAVER_LIBS) idle_la_SOURCES = idle.c idle_la_LDFLAGS = \ - -module -avoid-version -no-undefined + -module -avoid-version -idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) +idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES) diff --git a/src/common/Makefile.in b/src/common/Makefile.in index db08087f3..145b6dbf6 100644 --- a/src/common/Makefile.in +++ b/src/common/Makefile.in @@ -14,9 +14,6 @@ @SET_MAKE@ -#CLEANFILES = \ -# trayicon.c - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -87,6 +84,8 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ +BUILD_GTKSPELL_FALSE = @BUILD_GTKSPELL_FALSE@ +BUILD_GTKSPELL_TRUE = @BUILD_GTKSPELL_TRUE@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ @@ -253,9 +252,9 @@ idlelibdir = $(libdir)/gajim idle_la_LIBADD = $(XSCREENSAVER_LIBS) idle_la_SOURCES = idle.c idle_la_LDFLAGS = \ - -module -avoid-version -no-undefined + -module -avoid-version -idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) +idle_la_CFLAGS = $(XSCREENSAVER_CFLAGS) $(PYTHON_INCLUDES) all: all-am .SUFFIXES: