Update of /cvsroot/audacity/audacity-src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15267
Modified Files:
configure configure.in
Log Message:
Provide logout/shutdown interception and veto for Linux and Windows.
Index: configure
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- configure 9 May 2009 18:07:26 -0000 1.177
+++ configure 28 Jun 2009 08:56:06 -0000 1.178
@@ -642,6 +642,9 @@
LIBOBJS
JACK_LIBS
JACK_CFLAGS
+GTK_LIBS
+GTK_CFLAGS
+HAVE_GTK
host_os
host_vendor
host_cpu
@@ -813,6 +816,8 @@
PORTSMF_LIBS
TAGLIB_CFLAGS
TAGLIB_LIBS
+GTK_CFLAGS
+GTK_LIBS
JACK_CFLAGS
JACK_LIBS'
ac_subdirs_all='"lib-src/FileDialog"
@@ -1536,6 +1541,8 @@
TAGLIB_CFLAGS
C compiler flags for TAGLIB, overriding pkg-config
TAGLIB_LIBS linker flags for TAGLIB, overriding pkg-config
+ GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
+ GTK_LIBS linker flags for GTK, overriding pkg-config
JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
JACK_LIBS linker flags for JACK, overriding pkg-config
@@ -9126,10 +9133,88 @@
AFTERBUILD=""
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
-esac
+pkg_failed=no
+{ $as_echo "$as_me:$LINENO: checking for GTK" >&5
+$as_echo_n "checking for GTK... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"gtk+-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"gtk+-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
"gtk+-2.0" 2>&1`
+ else
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ have_gtk=no
+elif test $pkg_failed = untried; then
+ have_gtk=no
+else
+ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+ GTK_LIBS=$pkg_cv_GTK_LIBS
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_gtk=yes
+fi
+ if [ "$have_gtk" = "yes" ]
+ then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_GTK 1
+_ACEOF
+
+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+ fi
+ ;;
+esac
+
+
LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
CXXFLAGS="-I\$(top_srcdir)/lib-src/portaudio-v19/include $CXXFLAGS"
Index: configure.in
===================================================================
RCS file: /cvsroot/audacity/audacity-src/configure.in,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- configure.in 9 May 2009 18:07:26 -0000 1.149
+++ configure.in 28 Jun 2009 08:56:06 -0000 1.150
@@ -539,6 +539,15 @@
AFTERBUILD=""
EXTRAINSTALLTARGETS="$EXTRAINSTALLTARGETS install-extra-data"
EXTRAUNINSTALLTARGETS="$EXTRAUNINSTALLTARGETS uninstall-extra-data"
+
+ AC_SUBST(HAVE_GTK)
+ PKG_CHECK_MODULES(GTK, gtk+-2.0, have_gtk=yes, have_gtk=no)
+ if [[ "$have_gtk" = "yes" ]]
+ then
+ AC_DEFINE(HAVE_GTK, 1, [Define if GTK is available])
+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+ fi
+ ;;
esac
dnl PortAudio configuration
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
