From a0cb3a112125beb8dec33dcc249ae7cd8a562f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Thu, 23 Jul 2015 12:02:13 +0000 Subject: [PATCH] typo in filename --- ax_init_standard_project.m4 | 17 ++++++++--------- bootstrap.sh | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index d2fd59d..a900722 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -108,6 +108,14 @@ AC_DEFUN([AX_SUBST], [ # # configures the basic environment AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ + MINGW=no + MAC=no + case $host in + *mingw*) MINGW=yes;; + *darwin* | *rhapsody* | *macosx*) MAC=yes;; + esac + AM_CONDITIONAL(MINGW, test "$MINGW" = "yes") + AM_CONDITIONAL(MAC, test "$MAC" = "yes") AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_NAME//-/_}'" AX_SUBST(NUMBERS) AX_SUBST(HOME) @@ -189,15 +197,6 @@ AC_DEFUN([AX_USE_CXX], [ AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS) - MINGW=no - MAC=no - case $host_os in - *mingw*) MINGW=yes;; - *darwin* | *rhapsody* | *macosx*) MAC=yes;; - esac - AM_CONDITIONAL(MINGW, test "$MINGW" = "yes") - AM_CONDITIONAL(MAC, test "$MAC" = "yes") - AC_SUBST(AM_CXXFLAGS) AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_LDFLAGS) diff --git a/bootstrap.sh b/bootstrap.sh index a502507..6f5d350 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -720,7 +720,7 @@ ${HEADER}%: EOF echo 7 | to debian/compat fi -to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME} <