]> arthur.barton.de Git - netatalk.git/commitdiff
Fixes
authorFrank Lahm <franklahm@googlemail.com>
Thu, 22 Mar 2012 19:44:22 +0000 (20:44 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Thu, 22 Mar 2012 19:44:22 +0000 (20:44 +0100)
.gitignore
etc/netatalk/netatalk [deleted file]
etc/netatalk/netatalk.c

index 082ce574b65ebeefd4c1b4924284ff07ad83dd88..757ff5b24673ccc9579fe5e9b21ba04e5da93596 100644 (file)
@@ -84,3 +84,6 @@ libevent/test/test-init
 libevent/test/test-ratelim
 libevent/test/test-time
 libevent/test/test-weof
+libevent/configure
+libevent/devpoll.lo
+libevent/evport.lo
\ No newline at end of file
diff --git a/etc/netatalk/netatalk b/etc/netatalk/netatalk
deleted file mode 100755 (executable)
index cad206f..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /bin/sh
-
-# netatalk - temporary wrapper script for .libs/netatalk
-# Generated by ltmain.sh - GNU libtool 1.5.26 Debian 1.5.26-1ubuntu1 (1.1220.2.493 2008/02/01 16:58:18)
-#
-# The netatalk program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command="(cd /home/ralph/netatalk/allea/etc/netatalk; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; { test -z \"\${LD_LIBRARY_PATH+set}\" || unset LD_LIBRARY_PATH || { LD_LIBRARY_PATH=; export LD_LIBRARY_PATH; }; }; PATH=\"/usr/local/netatalk/bin:/home/ralph/netatalk/scan/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games\"; export PATH; gcc -std=gnu99 -I../../include -I../../libevent/include -D_PATH_CONFDIR=\\\"/usr/local/netatalk/etc/\\\" -D_PATH_AFPD=\\\"/usr/local/netatalk/sbin/afpd\\\" -D_PATH_CNID_METAD=\\\"/usr/local/netatalk/sbin/cnid_metad\\\" -I../../include -I../../sys \"-D_U_=__attribute__((unused))\" -g -O0 -Wno-sign-compare -Wno-unused -Wno-deprecated-declarations -D_PATH_LOCKDIR=\\\"/usr/local/netatalk/var/run/\\\" -o \$progdir/\$file netatalk-netatalk.o \"-D_U_=__attribute__((unused))\" -g -O0 -Wno-sign-compare -Wno-unused -Wno-deprecated-declarations -D_PATH_LOCKDIR=/usr/local/netatalk/var/run/ -Wl,-Bsymbolic-functions  ../../libatalk/.libs/libatalk.so ../../libevent/.libs/libevent.so -L/usr/lib -lkrb5 -lk5crypto -lcom_err -lpthread -L/home/ralph/netatalk/allea/libatalk  -Wl,--rpath -Wl,/home/ralph/netatalk/allea/libatalk/.libs -Wl,--rpath -Wl,/home/ralph/netatalk/allea/libevent/.libs -Wl,--rpath -Wl,/usr/local/netatalk/lib ) "
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variable:
-  notinst_deplibs=' ../../libatalk/libatalk.la ../../libevent/libevent.la'
-else
-  # When we are sourced in execute mode, $file and $echo are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    echo="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-      # Yippee, $echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $echo will work.
-      exec /bin/sh "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'netatalk'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" || \
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-       echo "$relink_command_output" >&2
-       rm -f "$progdir/$file"
-       exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      exec "$progdir/$program" ${1+"$@"}
-
-      $echo "$0: cannot exec $program $*"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $echo "$0: error: \`$progdir/$program' does not exist" 1>&2
-    $echo "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
index 6a9f4e50c953306c446d32f262b7d2e6a158a66d..1728f43256a5d22eb0d6fc8ba4ff806448b36804 100644 (file)
@@ -158,6 +158,7 @@ static pid_t run_process(const char *path, ...)
         LOG(log_error, logtype_cnid, "Fatal error in exec: %s", strerror(errno));
         exit(1);
     }
+    return pid;
 }
 
 static void usage(void)