Commit 78ed0a0b authored by Matt Edman's avatar Matt Edman
Browse files

Windows doesn't have autoconf and can't generate our config.h. Since all we 

really used config.h for was to save us from bumping the version number in yet
another location, we'll just tolerate it for now and ditch config.h.


svn:r835
parent d4a55da0

autogen.sh

+0 −1
Changes for autogen.sh: 0 added lines, 1 removed line.
Original line number Diff line number Diff line 
#!/bin/sh

aclocal && \

	autoheader && \

	autoconf && \

	./configure

configure

+1 −818

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

+0 −4
Changes for configure.in: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line 
AC_INIT(vidalia,0.0.5-svn)

AC_CONFIG_HEADERS(src/config.h)

AC_MSG_NOTICE([Configuring AC_PACKAGE_STRING...])

AC_PROG_CXX

PROFILE="Vidalia.pro"
@@ -28,9 +27,6 @@ AC_MSG_NOTICE([Building in $BUILDMODE mode]) 
dnl Clean out an existing Makefile

AC_CHECK_FILE(Makefile, [rm Makefile])



dnl Output config.h

AC_OUTPUT



dnl Build the translations

AC_MSG_NOTICE([Processing language translations...])

$LRELEASE $PROFILE

src/vidalia.h

+4 −3
Changes for src/vidalia.h: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#ifndef _VIDALIA_H

#define _VIDALIA_H



#include <config.h>



#if defined(Q_OS_WIN)

#include <windows.h>

#endif
@@ -41,6 +39,9 @@ 
#include <config/vidaliasettings.h>

#include <control/torcontrol.h>



/** Vidalia's version string */

#define VIDALIA_VERSION    "0.0.5-svn"





class Vidalia : public QApplication

{
@@ -71,7 +72,7 @@ public: 
  /** Returns the current GUI style. */

  static QString style() { return _style; }

  /** Returns Vidalia's application version. */

  static QString version() { return PACKAGE_VERSION; }

  static QString version() { return VIDALIA_VERSION; }



  /** Returns Vidalia's main TorControl object. */

  static TorControl* torControl() { return _torControl; }