diff options
| author | George Joseph <gjoseph@digium.com> | 2017-12-28 10:56:55 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-28 10:56:55 -0600 |
| commit | 712450c78aacfceddf369940ffbbcc7c2f9b370d (patch) | |
| tree | b284b38684f1c40c5bcfe7d12db6d74bd8cc9e57 | |
| parent | 9792bb0aa911f58ed58758ecae0f430ab515686f (diff) | |
| parent | 0bdddbe5266d197e5b2d149888673cf898d5ce7a (diff) | |
Merge "menuselect: Fix check for running configure." into 13
| -rw-r--r-- | menuselect/Makefile | 5 | ||||
| -rw-r--r-- | menuselect/configure.ac | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/menuselect/Makefile b/menuselect/Makefile index cdd7ebedb..c2c9373f4 100644 --- a/menuselect/Makefile +++ b/menuselect/Makefile @@ -64,10 +64,7 @@ all: $(ALL_TGTS) $(OBJS) $(C_OBJS) $(N_OBJS) $(G_OBJS) $(M_OBJS): autoconfig.h menuselect.h -makeopts: makeopts.in -autoconfig.h: autoconfig.h.in - -makeopts autoconfig.h: +makeopts: configure @./configure $(CONFIGURE_SILENT) @echo "****" @echo "**** The configure script was just executed, so 'make' needs to be" diff --git a/menuselect/configure.ac b/menuselect/configure.ac index 5945f5c9f..2dd4ed652 100644 --- a/menuselect/configure.ac +++ b/menuselect/configure.ac @@ -61,9 +61,7 @@ AH_TOP( #endif ) -AH_BOTTOM( -#endif -) +AH_BOTTOM([#endif]) # Checks for programs. AC_PROG_CC |