build: build related fixes

vadmeste · Apr 17, 2014 · 2dad542 · 2dad542
1 parent b9a12e2
commit 2dad542
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 418 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src extensions doc examples $(ARGP_STANDALONE_DIR)
+SUBDIRS = $(ARGP_STANDALONE_DIR) src extensions doc examples
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@

diff --git a/configure.ac b/configure.ac
@@ -51,6 +51,9 @@ fi
 
 AC_SUBST(ARGP_STANDALONE_CFLAGS)
 AC_SUBST(ARGP_STANDALONE_LDADD)
+AC_SUBST(ARGP_STANDALONE_DIR)
+
+AC_SUBST(CONTRIBDIR)
 
 AC_CHECK_LIB([readline -lcurses],[readline],[RLLIBS="-lreadline -lcurses"])
 AC_CHECK_LIB([readline -ltermcap],[readline],[RLLIBS="-lreadline -ltermcap"])

diff --git a/contrib/argp-standalone/config.h b/contrib/argp-standalone/config.h