Update of /cvsroot/audacity/lib-src/FileDialog
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4194
Modified Files:
FileDialog.h configure configure.ac
Added Files:
config.h.in
Log Message:
This should correct build issues if the gtk devel packages aren't installed.
Index: FileDialog.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/FileDialog/FileDialog.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FileDialog.h 30 Apr 2007 04:12:42 -0000 1.5
+++ FileDialog.h 3 Jun 2007 03:23:47 -0000 1.6
@@ -17,6 +17,8 @@
#ifndef _FILE_DIALOG_H_
#define _FILE_DIALOG_H_
+#include "config.h"
+
#include "wx/defs.h"
#include "wx/filedlg.h"
@@ -26,7 +28,7 @@
#include "mac/FileDialogPrivate.h"
#elif defined(__WXMSW__)
#include "win/FileDialogPrivate.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK__) && defined(HAVE_GTK)
#include "gtk/FileDialogPrivate.h"
#else
#include "generic/FileDialogPrivate.h"
Index: configure.ac
===================================================================
RCS file: /cvsroot/audacity/lib-src/FileDialog/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac 30 Apr 2007 04:12:44 -0000 1.1
+++ configure.ac 3 Jun 2007 03:23:48 -0000 1.2
@@ -3,9 +3,10 @@
#
AC_INIT(FileDialog, 1.0, audacity.sourceforge.net, FileDialog)
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile config.h])
AC_SUBST(EXTRADEPS)
AC_SUBST(EXTRAOBJS)
+AC_SUBST(HAVE_GTK)
#
# Checks for programs.
@@ -85,7 +86,7 @@
*)
dnl Unix configuration
- AM_PATH_GTK_2_0(2.8.0,
+ AM_PATH_GTK_2_0(2.4.0,
have_gtk="yes",
have_gtk="no")
if [[ "$have_gtk" = "yes" ]]
@@ -93,9 +94,11 @@
CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
EXTRADEPS="gtk/FileDialogPrivate.h gtk/private.h"
EXTRAOBJS="gtk/FileDialogPrivate.o"
+ HAVE_GTK=1
else
EXTRADEPS="generic/FileDialogPrivate.h"
EXTRAOBJS="generic/FileDialogPrivate.o"
+ HAVE_GTK=0
fi
;;
esac
--- NEW FILE: config.h.in ---
#define HAVE_GTK @HAVE_GTK@
Index: configure
===================================================================
RCS file: /cvsroot/audacity/lib-src/FileDialog/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure 30 Apr 2007 04:12:43 -0000 1.1
+++ configure 3 Jun 2007 03:23:47 -0000 1.2
@@ -1,27 +1,56 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for FileDialog 1.0.
+# Generated by GNU Autoconf 2.61 for FileDialog 1.0.
#
# Report bugs to <audacity.sourceforge.net>.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
[...5781 lines suppressed...]
+echo "$as_me: WARNING: $ac_file contains a reference to the variable
\`datarootdir'
+which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out"; rm -f "$tmp/out";;
+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
+ esac
+ ;;
+
+
+
+ esac
+
+done # for ac_tag
-cat >>$CONFIG_STATUS <<\_ACEOF
{ (exit 0); exit 0; }
_ACEOF
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
