diff --git a/autoconf.mk b/autoconf.mk --- a/autoconf.mk +++ b/autoconf.mk @@ -16,15 +16,15 @@ docdir := ${datarootdir}/doc/${PACKAGE_TARNAME} DARCS_VERSION := 2.0.2 -DEFS := -DPACKAGE_NAME=\"darcs\" -DPACKAGE_TARNAME=\"darcs\" -DPACKAGE_VERSION=\"2.0.2\" -DPACKAGE_STRING=\"darcs\ 2.0.2\" -DPACKAGE_BUGREPORT=\"bugs@darcs.net\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_HTTP=1 -CPPFLAGS := -DHAVE_BYTESTRING -DHAVE_CURSES -DPACKAGE_NAME=\"darcs\" -DPACKAGE_TARNAME=\"darcs\" -DPACKAGE_VERSION=\"2.0.2\" -DPACKAGE_STRING=\"darcs\ 2.0.2\" -DPACKAGE_BUGREPORT=\"bugs@darcs.net\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_HTTP=1 -CFLAGS := -O2 +DEFS := -DPACKAGE_NAME=\"darcs\" -DPACKAGE_TARNAME=\"darcs\" -DPACKAGE_VERSION=\"2.0.2\" -DPACKAGE_STRING=\"darcs\ 2.0.2\" -DPACKAGE_BUGREPORT=\"bugs@darcs.net\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_HTTP=1 -DHAVE_LIBCURL=1 +CPPFLAGS := -DHAVE_BYTESTRING -DHAVE_CURL -DCURL_MULTI_TIMEOUT -DHAVE_CURSES -DPACKAGE_NAME=\"darcs\" -DPACKAGE_TARNAME=\"darcs\" -DPACKAGE_VERSION=\"2.0.2\" -DPACKAGE_STRING=\"darcs\ 2.0.2\" -DPACKAGE_BUGREPORT=\"bugs@darcs.net\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_HTTP=1 -DHAVE_LIBCURL=1 +CFLAGS := -O2 OPTCCFLAGS := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS)) $(addprefix -opta,$(CFLAGS)) LDFLAGS := OPTLLDFLAGS := $(addprefix -optl,$(LDFLAGS)) -LIBS := -lcurses -lz +LIBS := -lcurses -lz -lcurl -lgssapi_krb5 OPTLLIBS := $(filter-out -%,$(LIBS)) $(addprefix -optl,$(filter -%,$(LIBS))) -GHCFLAGS := -threaded -package regex-compat -package HTTP -package QuickCheck -package html -O2 -funbox-strict-fields -DHAVE_BYTESTRING -DHAVE_CURSES -DPACKAGE_NAME=\"darcs\" -DPACKAGE_TARNAME=\"darcs\" -DPACKAGE_VERSION=\"2.0.2\" -DPACKAGE_STRING=\"darcs\ 2.0.2\" -DPACKAGE_BUGREPORT=\"bugs@darcs.net\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_HTTP=1 +GHCFLAGS := -threaded -package regex-compat -package HTTP -package QuickCheck -package html -O2 -funbox-strict-fields -DHAVE_BYTESTRING -DHAVE_CURL -DCURL_MULTI_TIMEOUT -DHAVE_CURSES -DPACKAGE_NAME=\"darcs\" -DPACKAGE_TARNAME=\"darcs\" -DPACKAGE_VERSION=\"2.0.2\" -DPACKAGE_STRING=\"darcs\ 2.0.2\" -DPACKAGE_BUGREPORT=\"bugs@darcs.net\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_HTTP=1 -DHAVE_LIBCURL=1 USE_GNULIBSHA1 := @USE_GNULIBSHA1@ HAVE_HTTP := True HAVE_CURSES := True diff --git a/configure b/configure --- a/configure +++ b/configure @@ -7979,7 +7979,7 @@ cat src/Workaround.hs.prefix src/Workaround.hs.beginning src/Workaround.hs.ending > src/Workaround.hs rm -f src/Workaround.hs.beginning src/Workaround.hs.ending src/Workaround.hs.prefix -ac_config_files="$ac_config_files autoconf.mk src/Autoconf.lhs tools/cgi/darcs.cgi tools/cgi/README tools/cgi/cgi.conf darcs.buildinfo" +ac_config_files="$ac_config_files autoconf.mk src/Autoconf.lhs tools/cgi/darcs.cgi tools/cgi/README tools/cgi/cgi.conf darcs-cabalized.buildinfo" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -8564,7 +8564,7 @@ "tools/cgi/darcs.cgi") CONFIG_FILES="$CONFIG_FILES tools/cgi/darcs.cgi" ;; "tools/cgi/README") CONFIG_FILES="$CONFIG_FILES tools/cgi/README" ;; "tools/cgi/cgi.conf") CONFIG_FILES="$CONFIG_FILES tools/cgi/cgi.conf" ;; - "darcs.buildinfo") CONFIG_FILES="$CONFIG_FILES darcs.buildinfo" ;; + "darcs-cabalized.buildinfo") CONFIG_FILES="$CONFIG_FILES darcs-cabalized.buildinfo" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -583,7 +583,7 @@ OUTPUT_WORKAROUND AC_CONFIG_FILES([autoconf.mk src/Autoconf.lhs tools/cgi/darcs.cgi tools/cgi/README tools/cgi/cgi.conf - darcs.buildinfo]) + darcs-cabalized.buildinfo]) AC_OUTPUT cat <<[EOF] diff --git a/darcs-cabalized.buildinfo b/darcs-cabalized.buildinfo new file mode 100644 --- /dev/null +++ b/darcs-cabalized.buildinfo @@ -0,0 +1,6 @@ +-- darcs-cabalized.buildinfo. Generated from darcs-cabalized.buildinfo.in by configure. +-- System-dependent values used by Distribution.Simple.defaultUserHooks +executable: darcs +CPP-options: -DHAVE_BYTESTRING -DHAVE_CURL -DCURL_MULTI_TIMEOUT -DHAVE_CURSES +ld-options: +cc-options: -DPACKAGE_VERSION="2.0.2" -DHAVE_BYTESTRING -DHAVE_CURL -DCURL_MULTI_TIMEOUT -DHAVE_CURSES diff --git a/darcs-cabalized.buildinfo.in b/darcs-cabalized.buildinfo.in new file mode 100644 --- /dev/null +++ b/darcs-cabalized.buildinfo.in @@ -0,0 +1,6 @@ +-- @configure_input@ +-- System-dependent values used by Distribution.Simple.defaultUserHooks +executable: darcs +CPP-options: @CPPFLAGS@ +ld-options: @LDFLAGS@ +cc-options: -DPACKAGE_VERSION="@PACKAGE_VERSION@" @CPPFLAGS@ diff --git a/darcs-cabalized.cabal b/darcs-cabalized.cabal --- a/darcs-cabalized.cabal +++ b/darcs-cabalized.cabal @@ -1,5 +1,5 @@ Name: darcs-cabalized -version: 2.0.2.1 +version: 2.0.2.2 License: GPL License-file: COPYING Author: David Roundy , , et al. @@ -44,7 +44,7 @@ src/umask.c, src/umask.h, -- Build files; we include the autoconf files just in case -- the user wishes to re-autoconf on her system. - darcs.buildinfo, darcs.buildinfo.in, configure, configure.ac, + darcs-cabalized.buildinfo, darcs-cabalized.buildinfo.in, configure, configure.ac, autoconf.mk, autoconf.mk.in, aclocal.m4, src/Autoconf.lhs.in, src/ThisVersion.lhs.in, install-sh, -- Windows files @@ -69,9 +69,8 @@ flag small_base description: Choose the new smaller, split-up base package. Defaults to True. -flag no_curses - description: Disable curses support. Defaults to False. - default: False +flag curses + description: Enables curses and curl support. Defaults to True Executable darcs main-is: darcs.lhs @@ -148,7 +147,6 @@ include-dirs: src -- zlib is mandatory; we need extra-libraries to fix FFI link errors - if flag(no_curses) - extra-libraries: z - else - extra-libraries: z, curses + extra-libraries: z + if flag(curses) + extra-libraries: curses, curl diff --git a/darcs.buildinfo b/darcs.buildinfo deleted file mode 100644 --- a/darcs.buildinfo +++ /dev/null @@ -1,6 +0,0 @@ --- darcs.buildinfo. Generated from darcs.buildinfo.in by configure. --- System-dependent values used by Distribution.Simple.defaultUserHooks -executable: darcs -CPP-options: -DHAVE_BYTESTRING -DHAVE_CURSES -ld-options: -cc-options: -DPACKAGE_VERSION="2.0.2" diff --git a/darcs.buildinfo.in b/darcs.buildinfo.in deleted file mode 100644 --- a/darcs.buildinfo.in +++ /dev/null @@ -1,6 +0,0 @@ --- @configure_input@ --- System-dependent values used by Distribution.Simple.defaultUserHooks -executable: darcs -CPP-options: @CPPFLAGS@ -ld-options: @LDFLAGS@ -cc-options: -DPACKAGE_VERSION="@PACKAGE_VERSION@"