- Convert dvd-writepart to Python.

[bacula/bacula] / bacula / configure

diff --git a/bacula/configure b/bacula/configure
index 25bf6e4e67f900b8b50828320a03e3f9cf291c0e..18b8b1eea89ba2f91843b6d1b9eb4fbf2b2083e8 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -4750,6 +4750,10 @@ echo "$as_me:$LINENO: result: done" >&5
 echo "${ECHO_T}done" >&6
 
 
+# --------------------------------------------------
+# Suppport for gettext (translations)
+# By default, $datadir is ${prefix}/share
+# --------------------------------------------------
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
@@ -6660,8 +6664,9 @@ _ACEOF
 
 
 
-localedir=${prefix}/locale
-LOCAL_DEFS="$LOCAL_DEFS -DLOCALEDIR=\"${localedir}\""
+if test x${prefix} = xNONE && test x${datadir} = x${prefix}/share ; then
+   datadir=/usr/share
+fi
 
 # ------------------------------------------------------------------
 #  If the user has not set --prefix, we set our default to nothing.
@@ -6676,6 +6681,12 @@ if test x${prefix} = xNONE ; then
     prefix=
 fi
 sysconfdir=`eval echo ${sysconfdir}`
+datadir=`eval echo ${datadir}`
+localedir=`eval echo ${datadir}/locale`
+cat >>confdefs.h <<_ACEOF
+#define LOCALEDIR "$localedir"
+_ACEOF
+
 
 # -------------------------------------------------------------------------
 #  If the user has not set --exec-prefix, we default to ${prefix}
@@ -7881,16 +7892,16 @@ if test "${with_readline+set}" = set; then
        case "$with_readline" in
        no) : ;;
        yes|*)
-          if test -f ${with_readline}/readline.h; then
-             CONS_INC="-I${with_readline}"
-             CONS_LDFLAGS="-L$with_readline"
-          elif test -f ${with_readline}/include/readline/readline.h; then
-             CONS_INC="-I${with_readline}/include/readline"
-             CONS_LDFLAGS="-L${with_readline}/lib"
-             with_readline="${with_readline}/include/readline"
-          else
-             with_readline="/usr/include/readline"
-          fi
+         if test -f ${with_readline}/readline.h; then
+            CONS_INC="-I${with_readline}"
+            CONS_LDFLAGS="-L$with_readline"
+         elif test -f ${with_readline}/include/readline/readline.h; then
+            CONS_INC="-I${with_readline}/include/readline"
+            CONS_LDFLAGS="-L${with_readline}/lib"
+            with_readline="${with_readline}/include/readline"
+         else
+            with_readline="/usr/include/readline"
+         fi
          as_ac_Header=`echo "ac_cv_header_${with_readline}/readline.h" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo "$as_me:$LINENO: checking for ${with_readline}/readline.h" >&5
@@ -8776,8 +8787,7 @@ fi
 
 
 
-
-for ac_func in strcasecmp select setenv putenv tcgetattr setlocale lstat lchown
+for ac_func in strcasecmp select setenv putenv tcgetattr lstat lchown
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -25256,6 +25266,7 @@ Configuration on `date`:
   PID directory:             ${piddir}
   Subsys directory:          ${subsysdir}
   Man directory:             ${mandir}
+  Data directory:            ${datadir}
   C Compiler:                ${CC} ${CCVERSION}
   C++ Compiler:              ${CXX} ${CXXVERSION}
   Compiler flags:            ${WCFLAGS} ${CFLAGS}