Commit d4a55da0 authored by Matt Edman's avatar Matt Edman
Browse files

qconf is too broken and annoying. We'll stick with the standard autoconf and 

friends, thank you very much.


svn:r834
parent 09245e94

Vidalia.pro

+0 −7
Changes for Vidalia.pro: 0 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -44,13 +44,6 @@ win32 { 
  # Link against these libraries on Win32

  LIBS += -lshell32 -lgdi32

}

!win32 {

  # On non-Windows, ./configure generates a conf.pri, so

  # include it if it exists

  exists(conf.pri) {

    include(conf.pri)

  }

}



include($$PWD/src/src.pri)

Vidalia.qc

deleted100644 → 0
+0 −18
Changes for Vidalia.qc: 0 added lines, 18 removed lines.
Original line number Diff line number Diff line 
<qconf>

  <name>Vidalia</name>

  <profile>Vidalia.pro</profile>

  <moddir>qcm</moddir>

  <dep type='qtversion'>

    <required/>

  </dep>

  <dep type='confclean'>

    <required/>

  </dep>

  <dep type='buildmode'>

    <required/>

  </dep>

  <dep type='lrelease'>

    <required/>

  </dep>

</qconf>

autogen.sh

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

aclocal && \

	autoheader && \

	autoconf && \

	./configure

configure

+2586 −1125

File changed.

Preview size limit exceeded, changes collapsed.

configure.in

0 → 100644
+41 −0
Changes for configure.in: 41 added lines, 0 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"



dnl Find qmake

AC_PATH_PROG(QMAKE, qmake, qmake)

if test x$QMAKE = x; then

  AC_MSG_ERROR([qmake must be in your path])

fi



dnl Find lrelease

AC_PATH_PROG(LRELEASE, lrelease, lrelease)

if test x$LRELEASE = x; then

  AC_MSG_ERROR([lrelease must be in your path])

fi



dnl Determine whether we should link to the debug versions of Qt or not

BUILDMODE="debug"

AC_ARG_ENABLE(debug,

    AC_HELP_STRING(--disable-debug, Disable debugging support))

if test x$enable_debug = xno; then

  BUILDMODE="release"

fi

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



dnl Run qmake to generate the Makefile

AC_MSG_NOTICE([Running qmake...])

$QMAKE -config $BUILDMODE $PROFILE