diff options
| author |  mszulecki | 2007-06-13 22:59:27 +0000 |
|---|---|---|
| committer | mszulecki | 2007-06-13 22:59:27 +0000 |
| commit | 0e5c325ca431d3f66584b0be32e353bcf37303a6 (patch) | |
| tree | 399d0d9f0a4af2ec540de36567a3be5ecf71518a | |
| parent | 23f2f6925e226dcce19c22b5f603b95f04a0b9e0 (diff) | |
| download | dskel-0e5c325ca431d3f66584b0be32e353bcf37303a6.tar.gz dskel-0e5c325ca431d3f66584b0be32e353bcf37303a6.tar.bz2 | |
Make libtool use GDC and fix CC variable usage.
git-svn-id: http://svn.sukimashita.com/repos/dskel/trunk@30 4281df72-ff29-0410-8fee-2d9ac0c5f5a7
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 13 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 6ae4eaf..8c6a6bd 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,19 @@ AM_MAINTAINER_MODE AC_GNU_SOURCE +dnl Check for GNU D Compiler +AC_PATH_PROG(GDC, "gdc", no) + +if test "x$GDC" = "xno"; then + AC_MSG_ERROR([No D compiler found]) +fi + +AC_SUBST(GDC) +AC_SUBST(GDC_VERSION,[$($GDC --version | grep -P -o "(?<=\()gdc (.*?)(?=,)")]) + +CC=$GDC +DFLAGS="-g -O2" + AC_PROG_INSTALL AC_PROG_LIBTOOL @@ -27,18 +40,6 @@ else AC_SUBST(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale") fi -dnl Check for GNU D Compiler -AC_PATH_PROG(GDC, "gdc", no) - -if test "x$GDC" = "xno"; then - AC_MSG_ERROR([No D compiler found]) -fi - -AC_SUBST(GDC) -AC_SUBST(GDC_VERSION,[$($GDC --version | grep -P -o "(?<=\()gdc (.*?)(?=,)")]) - -DFLAGS="-g -O2" - dnl Should I generate the documentation? AC_ARG_ENABLE(doc, AS_HELP_STRING(--disable-doc, do not generate documentation),, [ diff --git a/src/Makefile.am b/src/Makefile.am index 7a990f3..c6dcb3a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,3 @@ -CC=gdc - lib_LTLIBRARIES = libtestshlibrary.la libtestshlibrary_la_SOURCES = testshlibrary.d libtestshlibrary_la_LDFLAGS = -version-info 0:0:0 |