initial steps toward OS X portage

[OpenSRF.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 19a1696..9ebe579 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,11 @@ AC_INIT([OpenSRF],[trunk],[open-ils-dev@list.georgialibraries.org])
 AM_INIT_AUTOMAKE([OpenSRF], [trunk])
 AC_REVISION($Revision: 0.1 $)
 AC_CONFIG_SRCDIR([configure.ac])
-AC_PREFIX_DEFAULT([/openils/])
+AC_PREFIX_DEFAULT([/opensrf/])
 
 
 AC_SUBST(prefix)
+AC_SUBST(sysconfdir)
 
 
 AC_DEFUN([AC_PYTHON_MOD],[
@@ -36,7 +37,7 @@ AC_DEFUN([AC_PYTHON_MOD],[
         PYTHON="python"
     fi
     AC_MSG_CHECKING($PYTHON_NAME module: $1)
-        $PYTHON -c "import $1" 2>/tmp/null
+        $PYTHON -c "import $1" 2>/dev/null
         if test $? -eq 0;
         then
                 AC_MSG_RESULT(yes)
@@ -79,19 +80,6 @@ esac],
 AM_CONDITIONAL([BUILDPYTHON], [test x$OSRF_INSTALL_PYTHON = xtrue])
 AC_SUBST([OSRF_INSTALL_PYTHON])
 
-# create the legacy JSON headers and .so file for backwards compatibility?
-AC_ARG_ENABLE([legacyjson],
-[  --disable-legacyjson    disable the legacy json headers and .so file for backwards compatibility],
-[case "${enableval}" in
-    yes) OSRF_LEGACY_JSON=true ;;
-    no)  OSRF_LEGACY_JSON=false ;;
-  *) AC_MSG_ERROR([please choose another value for --disable-legacyjson (supported values are yes or no)]) ;;
-esac],
-[OSRF_LEGACY_JSON=true])
-
-AM_CONDITIONAL([BUILDJSON], [test x$OSRF_LEGACY_JSON = xtrue])
-AC_SUBST([OSRF_LEGACY_JSON])
-
 # enable debug?
 
 AC_ARG_ENABLE(debug,
@@ -125,9 +113,9 @@ AC_PROG_MAKE_SET
 # Set install path variables
 #------------------------------
 AC_ARG_WITH([tmp],
-[  --with-tmp=path              location for the tmp dir for openSRF (/tmp/osrftmp by default)],
+[  --with-tmp=path              location for the tmp dir for openSRF (default is /tmp)],
 [TMP=${withval}],
-[TMP=/tmp/osrftmp])
+[TMP=/tmp])
 AC_SUBST([TMP])
 
 AC_ARG_WITH([apxs],
@@ -214,7 +202,7 @@ fi
 #-----------------------------
 
 AC_CHECK_LIB([dl], [dlerror], [],AC_MSG_ERROR(***OpenSRF requires libdl))
-AC_CHECK_LIB([memcache], [mc_req_free], [], AC_MSG_ERROR(***OpenSRF requires memcache development headers))
+AC_SEARCH_LIBS([mc_req_free], [memcache], [], AC_MSG_ERROR(***OpenSRF requires memcache development headers))
 AC_CHECK_LIB([ncurses], [initscr], [], AC_MSG_ERROR(***OpenSRF requires ncurses development headers))
 AC_CHECK_LIB([readline], [readline], [], AC_MSG_ERROR(***OpenSRF requires readline development headers))
 AC_CHECK_LIB([xml2], [xmlAddID], [], AC_MSG_ERROR(***OpenSRF requires xml2 development headers))
@@ -274,6 +262,8 @@ AC_CONFIG_FILES([Makefile
 
 AC_OUTPUT
 
+bin/osrf_config --cconfig
+
 AC_MSG_RESULT([])
 AC_MSG_RESULT([--------------------- Configuration options:  -----------------------])
 
@@ -290,12 +280,6 @@ else
         AC_MSG_RESULT([OSRF install python?:            no])
 fi
 
-if test "$OSRF_LEGACY_JSON" = "true" ; then
-        AC_MSG_RESULT([OSRF install legacy json?:       yes])
-else
-        AC_MSG_RESULT([OSRF install legacy json?:      no])
-fi
-
        AC_MSG_RESULT(Installation directory prefix:            ${prefix})
        AC_MSG_RESULT(Tmp dir location:                         ${TMP})
        AC_MSG_RESULT(APXS2 location:                           ${APXS2})