diff options
| author | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2012-03-30 07:10:13 +0000 |
| commit | 6b4964727bffb379aca9601e1cf69051ccbf600c (patch) | |
| tree | 1d9739ea8b3b5e0421f1d99b39e798b1514fb644 /aconfigure.ac | |
| parent | 85ac546acb235df62169c4ad317da74a62e56a88 (diff) | |
Re #1474: Merged all changes from 1.12 - HEAD (from the 1.x branch)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3999 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'aconfigure.ac')
| -rw-r--r-- | aconfigure.ac | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/aconfigure.ac b/aconfigure.ac index 2a4e9e45..46fc03c1 100644 --- a/aconfigure.ac +++ b/aconfigure.ac @@ -1,4 +1,4 @@ -AC_INIT(pjproject,1.x) +AC_INIT(pjproject,2.x) host_orig="$host" @@ -92,6 +92,19 @@ case $host in ;; esac +AC_SUBST(ac_shlib_suffix) +case $target in + *mingw* | *cygw* | *win32* | *w32* ) + ac_shlib_suffix=dll + ;; + *darwin*) + ac_shlib_suffix=dylib + ;; + *) + ac_shlib_suffix=so + ;; +esac + AC_CHECK_LIB(pthread,pthread_create) AC_CHECK_LIB(wsock32,puts) AC_CHECK_LIB(ws2_32,puts) @@ -774,6 +787,18 @@ AC_ARG_ENABLE(libsamplerate, AC_MSG_RESULT([Skipping libsamplerate detection]) ) +dnl # Include libsamplerate +AC_SUBST(ac_resample_dll) +AC_ARG_ENABLE(resample_dll, + AC_HELP_STRING([--enable-resample-dll], + [Build libresample as shared library]), + [if test "$enable_resample_dll" = "yes"; then + [ac_resample_dll=1] + AC_MSG_RESULT([Building libresample as shared library... yes]) + fi], + AC_MSG_RESULT([Building libresample as shared library... no]) + ) + dnl # SDL alt prefix AC_ARG_WITH(sdl, AC_HELP_STRING([--with-sdl=DIR], @@ -1216,7 +1241,6 @@ AC_ARG_ENABLE(opencore_amrnb, fi ]) - dnl ########################################## dnl # dnl # MANUAL CONFIG |