dont make wrap a subdir of otk

[chaz/openbox] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7a2e5c5e90fbbc40ebf5b359830adf710d542984..9e7d9bfcbfa8fa86082bf078c53d8818b60d684a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,17 @@
 AC_PREREQ([2.50])
 AC_INIT([src/main.cc])
 AC_CONFIG_HEADERS(config.h)
-AC_LANG(C++)
+AC_LANG([C++])
+AC_ENABLE_STATIC([no])
+AC_ENABLE_SHARED([yes])
 
-AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
+AC_PREFIX_DEFAULT([/usr/local])
+if test "$prefix" = "NONE"; then
+  prefix=$ac_default_prefix
+  ac_configure_args="$ac_configure_args --prefix $prefix"
+fi
 
-test "$prefix" = "NONE" && prefix="$ac_default_prefix"
+AM_INIT_AUTOMAKE([openbox], [2.90.0cvs])
 
 AC_PATH_PROG([regex_cmd], [sed])
 test "$regex_cmd" || AC_MSG_ERROR([sed not found])
@@ -15,7 +21,9 @@ AM_MAINTAINER_MODE
 OB_DEBUG
 # Pick compiler specific/build target flags
 OB_COMPILER_FLAGS
+AC_C_BIGENDIAN
 
+AC_PROG_LN_S
 AC_PROG_LIBTOOL
 LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
@@ -26,7 +34,7 @@ AM_GNU_GETTEXT([external])
 
 PYTHON_DEVEL
                    
-AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h stdlib.h string.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
+AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdint.h stdio.h stdlib.h string.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h)
 AC_HEADER_TIME
 # AC_TYPE_SIGNAL
 
@@ -41,9 +49,8 @@ X11_EXT_XINERAMA
 AC_CONFIG_FILES([Makefile po/Makefile.in
                otk/Makefile
                src/Makefile
+               wrap/Makefile
                scripts/Makefile
-               util/Makefile
-               util/epist/Makefile
                doc/Makefile
                doc/doxygen/Makefile
                data/Makefile
@@ -67,4 +74,3 @@ AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
 AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
 AC_MSG_RESULT
 AC_MSG_RESULT([configure complete, now type \"make\"])
-AC_MSG_RESULT