X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=2edabc86d6e1deb28a3df7edbb668d0a12c73c8b;hp=3bcd0d303f8c090614a1aefd3cf08fb2d2b86cb9;hb=99708bef7ad12ccb9399186f6055004d11bcf3db;hpb=5e8cf70d0d16498fc1dd238c7268797ca2325e45

diff --git a/configure.ac b/configure.ac
index 3bcd0d30..2edabc86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,16 +81,16 @@ fi
 
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([gengetopt], [gengetopt])
-test -z "$gengetopt" && AC_MSG_ERROR(
+AC_PATH_PROG([GENGETOPT], [gengetopt])
+test -z "$GENGETOPT" && AC_MSG_ERROR(
 	[gengetopt is required to build this package])
 
-AC_PATH_PROG([help2man], [help2man])
-test -z "$help2man" && AC_MSG_ERROR(
+AC_PATH_PROG([HELP2MAN], [help2man])
+test -z "$HELP2MAN" && AC_MSG_ERROR(
 	[help2man is required to build this package])
 
-AC_PATH_PROG([install], [install])
-test -z "$install" && AC_MSG_ERROR(
+AC_PATH_PROG([INSTALL], [install])
+test -z "$INSTALL" && AC_MSG_ERROR(
 	[The install program is required to build this package])
 
 AC_PROG_CC
@@ -194,7 +194,7 @@ if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
 ########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $gengetopt --file-name conftest-ggo &&
+echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
 AC_CHECK_DECL(
 	[gengetopt_args_info_description],
 	[ggo_descriptions_declared=yes],
@@ -203,39 +203,14 @@ AC_CHECK_DECL(
 )
 AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
-have_curses="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
-	[look for curses.h also in dir])])
-if test -n "$with_curses_headers"; then
-	curses_cppflags="-I$with_curses_headers"
-	CPPFLAGS="$CPPFLAGS $curses_cppflags"
-fi
-AC_ARG_WITH(curses_libs, [AS_HELP_STRING(--with-curses-libs=dir,
-	[look for libcurses also in dir])])
-if test -n "$with_curses_libs"; then
-	curses_libs="-L$with_curses_libs"
-	LDFLAGS="$LDFLAGS $curses_libs"
-fi
-AC_CHECK_HEADER(curses.h, [], [
-	have_curses="no"
-])
-curses_ldflags="$curses_libs"
-AC_CHECK_LIB([ncursesw], [initscr],
-	[curses_ldflags="$curses_libs -lncursesw"], [
-		AC_CHECK_LIB([curses], [initscr],
-			[curses_ldflags="$curses_libs -lcurses"],
-			[have_curses="no"]
-		)
-	]
-)
-AC_SUBST(curses_cppflags)
-AC_SUBST(curses_ldflags)
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([curses], [])
+HAVE_CURSES=yes
+AC_CHECK_HEADER(curses.h, [], [HAVE_CURSES=no])
+AC_SEARCH_LIBS([initscr], [ncursesw curses], [], [HAVE_CURSES=no])
+curses_ldflags="$curses_ldflags $LIBS"
+LIB_SUBST_FLAGS(curses)
+UNSTASH_FLAGS
 ########################################################################### ip_mreqn
 AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast))
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -673,7 +648,7 @@ else
 	AC_MSG_WARN([no mixer support])
 fi
 ########################################################################### gui
-if test "$have_curses" = "yes"; then
+if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
 	gui_cmdline_objs="gui"